import * as retry from 'async/retry'
import * as Bluebird from 'bluebird'
+import { QueryTypes, Transaction } from 'sequelize'
import { Model } from 'sequelize-typescript'
+import { sequelizeTypescript } from '@server/initializers/database'
import { logger } from './logger'
-import { Transaction } from 'sequelize'
function retryTransactionWrapper <T, A, B, C, D> (
functionToRetry: (arg1: A, arg2: B, arg3: C, arg4: D) => Promise<T> | Bluebird<T>,
.map(f => f.destroy({ transaction: t }))
}
+// Sequelize always skip the update if we only update updatedAt field
+function setAsUpdated (table: string, id: number, transaction?: Transaction) {
+ return sequelizeTypescript.query(
+ `UPDATE "${table}" SET "updatedAt" = :updatedAt WHERE id = :id`,
+ {
+ replacements: { table, id, updatedAt: new Date() },
+ type: QueryTypes.UPDATE,
+ transaction
+ }
+ )
+}
+
// ---------------------------------------------------------------------------
export {
transactionRetryer,
updateInstanceWithAnother,
afterCommitIfTransaction,
- deleteNonExistingModels
+ deleteNonExistingModels,
+ setAsUpdated
}
import 'mocha'
import * as chai from 'chai'
import { basename } from 'path'
+import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
import {
cleanupTests,
createUser,
getVideo,
getVideoChannel,
getVideoChannelVideos,
+ setDefaultVideoChannel,
testImage,
updateVideo,
updateVideoChannelImage,
} from '../../../../shared/extra-utils/index'
import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
import { User, Video, VideoChannel, VideoDetails } from '../../../../shared/index'
-import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
const expect = chai.expect
describe('Test video channels', function () {
let servers: ServerInfo[]
let userInfo: User
- let firstVideoChannelId: number
let secondVideoChannelId: number
+ let totoChannel: number
let videoUUID: string
+ let accountName: string
before(async function () {
this.timeout(60000)
servers = await flushAndRunMultipleServers(2)
await setAccessTokensToServers(servers)
- await doubleFollow(servers[0], servers[1])
-
- {
- const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
- const user: User = res.body
-
- firstVideoChannelId = user.videoChannels[0].id
- }
+ await setDefaultVideoChannel(servers)
- await waitJobs(servers)
+ await doubleFollow(servers[0], servers[1])
})
it('Should have one video channel (created with root)', async () => {
expect(videoChannels[1].displayName).to.equal('second video channel')
expect(videoChannels[1].description).to.equal('super video channel description')
expect(videoChannels[1].support).to.equal('super video channel support text')
+
+ accountName = userInfo.account.name + '@' + userInfo.account.host
})
it('Should have two video channels when getting account channels on server 1', async function () {
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host
+ accountName
})
expect(res.body.total).to.equal(2)
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
start: 0,
count: 1,
sort: 'createdAt'
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
start: 0,
count: 1,
sort: '-createdAt'
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
start: 1,
count: 1,
sort: '-createdAt'
it('Should have one video channel when getting account channels on server 2', async function () {
const res = await getAccountVideoChannelsList({
url: servers[1].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host
+ accountName
})
expect(res.body.total).to.equal(1)
it('Should change the video channel of a video', async function () {
this.timeout(10000)
- await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: firstVideoChannelId })
+ await updateVideo(servers[0].url, servers[0].accessToken, videoUUID, { channelId: servers[0].videoChannel.id })
await waitJobs(servers)
})
it('Should create the main channel with an uuid if there is a conflict', async function () {
{
const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' }
- await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+ const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+ totoChannel = res.body.videoChannel.id
}
{
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
withStats: true
})
}
{
- // video has been posted on channel firstVideoChannelId since last update
+ // video has been posted on channel servers[0].videoChannel.id since last update
await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.1,127.0.0.1')
await viewVideo(servers[0].url, videoUUID, 204, '0.0.0.2,127.0.0.1')
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
withStats: true
})
- const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === firstVideoChannelId)
+ const channelWithView = res.body.data.find((channel: VideoChannel) => channel.id === servers[0].videoChannel.id)
expect(channelWithView.viewsPerDay.slice(-1)[0].views).to.equal(2)
}
})
it('Should report correct videos count', async function () {
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
withStats: true
})
const channels: VideoChannel[] = res.body.data
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
search: 'root'
})
expect(res.body.total).to.equal(1)
{
const res = await getAccountVideoChannelsList({
url: servers[0].url,
- accountName: userInfo.account.name + '@' + userInfo.account.host,
+ accountName,
search: 'does not exist'
})
expect(res.body.total).to.equal(0)
}
})
+ it('Should list channels by updatedAt desc if a video has been uploaded', async function () {
+ this.timeout(30000)
+
+ await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: totoChannel })
+ await waitJobs(servers)
+
+ for (const server of servers) {
+ const res = await getAccountVideoChannelsList({
+ url: server.url,
+ accountName,
+ sort: '-updatedAt'
+ })
+
+ const channels: VideoChannel[] = res.body.data
+ expect(channels[0].name).to.equal('toto_channel')
+ expect(channels[1].name).to.equal('root_channel')
+ }
+
+ await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: servers[0].videoChannel.id })
+ await waitJobs(servers)
+
+ for (const server of servers) {
+ const res = await getAccountVideoChannelsList({
+ url: server.url,
+ accountName,
+ sort: '-updatedAt'
+ })
+
+ const channels: VideoChannel[] = res.body.data
+ expect(channels[0].name).to.equal('root_channel')
+ expect(channels[1].name).to.equal('toto_channel')
+ }
+ })
+
after(async function () {
await cleanupTests(servers)
})