import * as express from 'express'
import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared'
-import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers'
-import { database as db } from '../../../initializers'
-import { createVideoChannel } from '../../../lib'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects, resetSequelizeInstance } from '../../../helpers/utils'
+import { sequelizeTypescript } from '../../../initializers'
+import { setAsyncActorKeys } from '../../../lib/activitypub'
+import { sendUpdateActor } from '../../../lib/activitypub/send'
+import { createVideoChannel } from '../../../lib/video-channel'
import {
- asyncMiddleware,
- authenticate,
- listVideoAccountChannelsValidator,
- paginationValidator,
- setPagination,
- setVideoChannelsSort,
- videoChannelsGetValidator,
- videoChannelsAddValidator,
- videoChannelsRemoveValidator,
- videoChannelsSortValidator,
+ asyncMiddleware, authenticate, listVideoAccountChannelsValidator, paginationValidator, setDefaultSort, setDefaultPagination,
+ videoChannelsAddValidator, videoChannelsGetValidator, videoChannelsRemoveValidator, videoChannelsSortValidator,
videoChannelsUpdateValidator
} from '../../../middlewares'
-import { AccountInstance, VideoChannelInstance } from '../../../models'
-import { sendUpdateVideoChannel } from '../../../lib/activitypub/send-request'
+import { AccountModel } from '../../../models/account/account'
+import { VideoChannelModel } from '../../../models/video/video-channel'
const videoChannelRouter = express.Router()
videoChannelRouter.get('/channels',
paginationValidator,
videoChannelsSortValidator,
- setVideoChannelsSort,
- setPagination,
+ setDefaultSort,
+ setDefaultPagination,
asyncMiddleware(listVideoChannels)
)
videoChannelRouter.get('/accounts/:accountId/channels',
- listVideoAccountChannelsValidator,
+ asyncMiddleware(listVideoAccountChannelsValidator),
asyncMiddleware(listVideoAccountChannels)
)
videoChannelRouter.put('/channels/:id',
authenticate,
- videoChannelsUpdateValidator,
+ asyncMiddleware(videoChannelsUpdateValidator),
updateVideoChannelRetryWrapper
)
videoChannelRouter.delete('/channels/:id',
authenticate,
- videoChannelsRemoveValidator,
+ asyncMiddleware(videoChannelsRemoveValidator),
asyncMiddleware(removeVideoChannelRetryWrapper)
)
videoChannelRouter.get('/channels/:id',
- videoChannelsGetValidator,
+ asyncMiddleware(videoChannelsGetValidator),
asyncMiddleware(getVideoChannel)
)
// ---------------------------------------------------------------------------
async function listVideoChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.VideoChannel.listForApi(req.query.start, req.query.count, req.query.sort)
+ const resultList = await VideoChannelModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function listVideoAccountChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.VideoChannel.listByAccount(res.locals.account.id)
+ const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
errorMessage: 'Cannot insert the video video channel with many retries.'
}
- await retryTransactionWrapper(addVideoChannel, options)
-
- // TODO : include Location of the new video channel -> 201
- return res.type('json').status(204).end()
+ const videoChannel = await retryTransactionWrapper(addVideoChannel, options)
+ return res.json({
+ videoChannel: {
+ id: videoChannel.id
+ }
+ }).end()
}
async function addVideoChannel (req: express.Request, res: express.Response) {
const videoChannelInfo: VideoChannelCreate = req.body
- const account: AccountInstance = res.locals.oauth.token.User.Account
- let videoChannelCreated: VideoChannelInstance
+ const account: AccountModel = res.locals.oauth.token.User.Account
- await db.sequelize.transaction(async t => {
- videoChannelCreated = await createVideoChannel(videoChannelInfo, account, t)
+ const videoChannelCreated: VideoChannelModel = await sequelizeTypescript.transaction(async t => {
+ return createVideoChannel(videoChannelInfo, account, t)
})
- logger.info('Video channel with uuid %s created.', videoChannelCreated.uuid)
+ setAsyncActorKeys(videoChannelCreated.Actor)
+ .catch(err => logger.error('Cannot set async actor keys for account %s.', videoChannelCreated.Actor.uuid, { err }))
+
+ logger.info('Video channel with uuid %s created.', videoChannelCreated.Actor.uuid)
+
+ return videoChannelCreated
}
async function updateVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
}
async function updateVideoChannel (req: express.Request, res: express.Response) {
- const videoChannelInstance: VideoChannelInstance = res.locals.videoChannel
+ const videoChannelInstance = res.locals.videoChannel as VideoChannelModel
const videoChannelFieldsSave = videoChannelInstance.toJSON()
- const videoChannelInfoToUpdate: VideoChannelUpdate = req.body
+ const videoChannelInfoToUpdate = req.body as VideoChannelUpdate
try {
- await db.sequelize.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
if (videoChannelInfoToUpdate.name !== undefined) videoChannelInstance.set('name', videoChannelInfoToUpdate.name)
if (videoChannelInfoToUpdate.description !== undefined) videoChannelInstance.set('description', videoChannelInfoToUpdate.description)
+ if (videoChannelInfoToUpdate.support !== undefined) videoChannelInstance.set('support', videoChannelInfoToUpdate.support)
- await videoChannelInstance.save(sequelizeOptions)
-
- await sendUpdateVideoChannel(videoChannelInstance, t)
+ const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions)
+ await sendUpdateActor(videoChannelInstanceUpdated, t)
})
- logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.uuid)
+ logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
} catch (err) {
- logger.debug('Cannot update the video channel.', err)
+ logger.debug('Cannot update the video channel.', { err })
// Force fields we want to update
// If the transaction is retried, sequelize will think the object has not changed
}
async function removeVideoChannel (req: express.Request, res: express.Response) {
- const videoChannelInstance: VideoChannelInstance = res.locals.videoChannel
+ const videoChannelInstance: VideoChannelModel = res.locals.videoChannel
- await db.sequelize.transaction(async t => {
+ return sequelizeTypescript.transaction(async t => {
await videoChannelInstance.destroy({ transaction: t })
+
+ logger.info('Video channel with name %s and uuid %s deleted.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
})
- logger.info('Video channel with name %s and uuid %s deleted.', videoChannelInstance.name, videoChannelInstance.uuid)
}
async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) {
- const videoChannelWithVideos = await db.VideoChannel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id)
+ const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id)
return res.json(videoChannelWithVideos.toFormattedJSON())
}