IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add history on server side

Browse Source 
Add ability to disable, clear and list user videos history
This commit is contained in:
Chocobozzz
2018-12-17 15:52:38 +01:00
parent 583cd0d212
commit 8b9a525a18
19 changed files with 385 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/tests/api/check-params/users.ts
View File

@@ -308,6 +308,14 @@ describe('Test users API validators', function () {
await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields })
})
it('Should fail with an invalid videosHistoryEnabled attribute', async function () {
const fields = {
videosHistoryEnabled: -1
}
await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields })
})
it('Should fail with an non authenticated user', async function () {
const fields = {
currentPassword: 'my super password',

70
server/tests/api/check-params/videos-history.ts
View File

@@ -3,8 +3,11 @@
import * as chai from 'chai'
import 'mocha'
import {
checkBadCountPagination,
checkBadStartPagination,
flushTests,
killallServers,
makeGetRequest,
makePostBodyRequest,
makePutBodyRequest,
runServer,
@@ -16,7 +19,9 @@ import {
const expect = chai.expect
describe('Test videos history API validator', function () {
let path: string
let watchingPath: string
let myHistoryPath = '/api/v1/users/me/history/videos'
let myHistoryRemove = myHistoryPath + '/remove'
let server: ServerInfo
// ---------------------------------------------------------------
@@ -33,14 +38,14 @@ describe('Test videos history API validator', function () {
const res = await uploadVideo(server.url, server.accessToken, {})
const videoUUID = res.body.video.uuid
path = '/api/v1/videos/' + videoUUID + '/watching'
watchingPath = '/api/v1/videos/' + videoUUID + '/watching'
})
describe('When notifying a user is watching a video', function () {
it('Should fail with an unauthenticated user', async function () {
const fields = { currentTime: 5 }
await makePutBodyRequest({ url: server.url, path, fields, statusCodeExpected: 401 })
await makePutBodyRequest({ url: server.url, path: watchingPath, fields, statusCodeExpected: 401 })
})
it('Should fail with an incorrect video id', async function () {
@@ -58,13 +63,68 @@ describe('Test videos history API validator', function () {
it('Should fail with a bad current time', async function () {
const fields = { currentTime: 'hello' }
await makePutBodyRequest({ url: server.url, path, fields, token: server.accessToken, statusCodeExpected: 400 })
await makePutBodyRequest({ url: server.url, path: watchingPath, fields, token: server.accessToken, statusCodeExpected: 400 })
})
it('Should succeed with the correct parameters', async function () {
const fields = { currentTime: 5 }
await makePutBodyRequest({ url: server.url, path, fields, token: server.accessToken, statusCodeExpected: 204 })
await makePutBodyRequest({ url: server.url, path: watchingPath, fields, token: server.accessToken, statusCodeExpected: 204 })
})
})
describe('When listing user videos history', function () {
it('Should fail with a bad start pagination', async function () {
await checkBadStartPagination(server.url, myHistoryPath, server.accessToken)
})
it('Should fail with a bad count pagination', async function () {
await checkBadCountPagination(server.url, myHistoryPath, server.accessToken)
})
it('Should fail with an unauthenticated user', async function () {
await makeGetRequest({ url: server.url, path: myHistoryPath, statusCodeExpected: 401 })
})
it('Should succeed with the correct params', async function () {
await makeGetRequest({ url: server.url, token: server.accessToken, path: myHistoryPath, statusCodeExpected: 200 })
})
})
describe('When removing user videos history', function () {
it('Should fail with an unauthenticated user', async function () {
await makePostBodyRequest({ url: server.url, path: myHistoryPath + '/remove', statusCodeExpected: 401 })
})
it('Should fail with a bad beforeDate parameter', async function () {
const body = { beforeDate: '15' }
await makePostBodyRequest({
url: server.url,
token: server.accessToken,
path: myHistoryRemove,
fields: body,
statusCodeExpected: 400
})
})
it('Should succeed with a valid beforeDate param', async function () {
const body = { beforeDate: new Date().toISOString() }
await makePostBodyRequest({
url: server.url,
token: server.accessToken,
path: myHistoryRemove,
fields: body,
statusCodeExpected: 204
})
})
it('Should succeed without body', async function () {
await makePostBodyRequest({
url: server.url,
token: server.accessToken,
path: myHistoryRemove,
statusCodeExpected: 204
})
})
})

85
server/tests/api/videos/videos-history.ts
View File

@@ -3,17 +3,21 @@
import * as chai from 'chai'
import 'mocha'
import {
createUser,
flushTests,
getVideosListWithToken,
getVideoWithToken,
killallServers, makePutBodyRequest,
runServer, searchVideoWithToken,
killallServers,
runServer,
searchVideoWithToken,
ServerInfo,
setAccessTokensToServers,
uploadVideo
updateMyUser,
uploadVideo,
userLogin
} from '../../../../shared/utils'
import { Video, VideoDetails } from '../../../../shared/models/videos'
import { userWatchVideo } from '../../../../shared/utils/videos/video-history'
import { listMyVideosHistory, removeMyVideosHistory, userWatchVideo } from '../../../../shared/utils/videos/video-history'
const expect = chai.expect
@@ -22,6 +26,8 @@ describe('Test videos history', function () {
let video1UUID: string
let video2UUID: string
let video3UUID: string
let video3WatchedDate: Date
let userAccessToken: string
before(async function () {
this.timeout(30000)
@@ -46,6 +52,13 @@ describe('Test videos history', function () {
const res = await uploadVideo(server.url, server.accessToken, { name: 'video 3' })
video3UUID = res.body.video.uuid
}
const user = {
username: 'user_1',
password: 'super password'
}
await createUser(server.url, server.accessToken, user.username, user.password)
userAccessToken = await userLogin(server, user)
})
it('Should get videos, without watching history', async function () {
@@ -62,8 +75,8 @@ describe('Test videos history', function () {
})
it('Should watch the first and second video', async function () {
await userWatchVideo(server.url, server.accessToken, video1UUID, 3)
await userWatchVideo(server.url, server.accessToken, video2UUID, 8)
await userWatchVideo(server.url, server.accessToken, video1UUID, 3)
})
it('Should return the correct history when listing, searching and getting videos', async function () {
@@ -117,6 +130,68 @@ describe('Test videos history', function () {
}
})
it('Should have these videos when listing my history', async function () {
video3WatchedDate = new Date()
await userWatchVideo(server.url, server.accessToken, video3UUID, 2)
const res = await listMyVideosHistory(server.url, server.accessToken)
expect(res.body.total).to.equal(3)
const videos: Video[] = res.body.data
expect(videos[0].name).to.equal('video 3')
expect(videos[1].name).to.equal('video 1')
expect(videos[2].name).to.equal('video 2')
})
it('Should not have videos history on another user', async function () {
const res = await listMyVideosHistory(server.url, userAccessToken)
expect(res.body.total).to.equal(0)
expect(res.body.data).to.have.lengthOf(0)
})
it('Should clear my history', async function () {
await removeMyVideosHistory(server.url, server.accessToken, video3WatchedDate.toISOString())
})
it('Should have my history cleared', async function () {
const res = await listMyVideosHistory(server.url, server.accessToken)
expect(res.body.total).to.equal(1)
const videos: Video[] = res.body.data
expect(videos[0].name).to.equal('video 3')
})
it('Should disable videos history', async function () {
await updateMyUser({
url: server.url,
accessToken: server.accessToken,
videosHistoryEnabled: false
})
await userWatchVideo(server.url, server.accessToken, video2UUID, 8, 409)
})
it('Should re-enable videos history', async function () {
await updateMyUser({
url: server.url,
accessToken: server.accessToken,
videosHistoryEnabled: true
})
await userWatchVideo(server.url, server.accessToken, video1UUID, 8)
const res = await listMyVideosHistory(server.url, server.accessToken)
expect(res.body.total).to.equal(2)
const videos: Video[] = res.body.data
expect(videos[0].name).to.equal('video 1')
expect(videos[1].name).to.equal('video 3')
})
after(async function () {
killallServers([ server ])