aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorGaƫtan Rizio <gaetan@rizio.fr>2018-09-04 08:57:13 +0200
committerChocobozzz <me@florianbigard.com>2018-09-04 08:57:13 +0200
commit74d63469355bad731cdd32defdc85913df3cbd5c (patch)
tree5e7a9033a507fd69c554ddc7cc6ce3f7a6416ca1 /server/models
parent2303a803aa19c2857efac9f2af2223ccae5757e2 (diff)
downloadPeerTube-74d63469355bad731cdd32defdc85913df3cbd5c.tar.gz
PeerTube-74d63469355bad731cdd32defdc85913df3cbd5c.tar.zst
PeerTube-74d63469355bad731cdd32defdc85913df3cbd5c.zip
Users can change ownership of their video [#510] (#888)
* [#510] Create a new route to get the list of user names To be able to transfer ownership to a user, we need to be able to select him from the list of users. Because the list could be too big, we add a autocomplete feature. This commit does the following: * Add a API endpoint to get a list of user names by searching its name * [#510] The user can choose the next owner of the video To be able to transfer ownership to a user, we need the owner to be able to select the user. The server can autocomplete the name of the user to give the ownership. We add a dialog for the user to actually select it. This commit does the following: * Create a modal for the owner to select the next one * Opens this modal with a button into the menu *more* * Make the dependency injection * [#510] When the user choose the next owner, create a request in database For the change of ownership to happen, we need to store the temporary requests. When the user make the request, save it to database. This commit does the following: * Create the model to persist change ownership requests * Add an API to manage ownership operations * Add a route to persist an ownership request * [#510] A user can fetch its ownership requests sent to him To be able to accept or refuse a change of ownership, the user must be able to fetch them. This commit does the following: * Add an API to list ownership for a user * Add the query to database model * [#510] A user can validate an ownership requests sent to him - server The user can accept or refuse any ownership request that was sent to him. This commit focus only on the server part. This commit does the following: * Add an API for the user to accept or refuse a video ownership * Add validators to ensure security access * Add a query to load a specific video change ownership request * [#510] A user can validate an ownership requests sent to him - web The user can accept or refuse any ownership request that was sent to him. This commit focus only on the web part. This commit does the following: * Add a page to list user ownership changes * Add actions to accept or refuse them * When accepting, show a modal requiring the channel to send the video * Correct lint - to squash * [#510] PR reviews - to squash This commit does the following: * Search parameter for user autocompletion is required from middleware directly * [#510] PR reviews - to squash with creation in database commit This commit does the following: * Add the status attribute in model * Set this attribute on instance creation * Use AccountModel method `loadLocalByName` * [#510] PR reviews - to squash with fetch ownership This commit does the following: * Add the scope `FULL` for database queries with includes * Add classic pagination middlewares * [#510] PR reviews - to squash with ownership validation - server This commit does the following: * Add a middleware to validate whether a user can validate an ownership * Change the ownership status instead of deleting the row * [#510] PR reviews - to squash with ownership validation - client This commit does the following: * Correct indentation of html files with two-spaces indentation * Use event emitter instead of function for accept event * Update the sort of ownership change table for a decreasing order by creation date * Add the status in ownership change table * Use classic method syntax * code style - to squash * Add new user right - to squash * Move the change to my-account instead of video-watch - to squash As requested in pull-request, move the action to change ownership into my videos page. The rest of the logic was not really changed. This commit does the following: - Move the modal into my video page - Create the generic component `button` to keep some styles and logic * [#510] Add tests for the new feature To avoid regression, we add tests for all api of ownership change. This commit does the following: - Create an end-to-end test for ownership change - Divide it to one test per request * [#510] Do not send twice the same request to avoid spam We can send several time the same request to change ownership. However, it will spam the user. To avoid this, we do not save a request already existing in database. This commit does the following: - Check whether the request exist in database - Add tests to verify this new condition * [#510] Change icons Change icons so they remains logic with the rest of the application. This commit does the following: - Add svg for missing icons - Add icons in `my-button` component - Use these new icons * [#510] Add control about the user quota The user should be able to accept a new video only if his quota allows it. This commit does the following: - Update the middleware to control the quota - Add tests verifying the control * Correct merge - Use new modal system - Move button to new directory `buttons` * PR reviews - to squash
Diffstat (limited to 'server/models')
-rw-r--r--server/models/account/user.ts12
-rw-r--r--server/models/video/video-change-ownership.ts127
2 files changed, 139 insertions, 0 deletions
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 89265774b..4b13e47a0 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -39,6 +39,7 @@ import { AccountModel } from './account'
39import { NSFWPolicyType } from '../../../shared/models/videos/nsfw-policy.type' 39import { NSFWPolicyType } from '../../../shared/models/videos/nsfw-policy.type'
40import { values } from 'lodash' 40import { values } from 'lodash'
41import { NSFW_POLICY_TYPES } from '../../initializers' 41import { NSFW_POLICY_TYPES } from '../../initializers'
42import { VideoFileModel } from '../video/video-file'
42 43
43enum ScopeNames { 44enum ScopeNames {
44 WITH_VIDEO_CHANNEL = 'WITH_VIDEO_CHANNEL' 45 WITH_VIDEO_CHANNEL = 'WITH_VIDEO_CHANNEL'
@@ -393,4 +394,15 @@ export class UserModel extends Model<UserModel> {
393 return parseInt(total, 10) 394 return parseInt(total, 10)
394 }) 395 })
395 } 396 }
397
398 static autocomplete (search: string) {
399 return UserModel.findAll({
400 where: {
401 username: {
402 [Sequelize.Op.like]: `%${search}%`
403 }
404 }
405 })
406 .then(u => u.map(u => u.username))
407 }
396} 408}
diff --git a/server/models/video/video-change-ownership.ts b/server/models/video/video-change-ownership.ts
new file mode 100644
index 000000000..c9cff5054
--- /dev/null
+++ b/server/models/video/video-change-ownership.ts
@@ -0,0 +1,127 @@
1import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
2import { AccountModel } from '../account/account'
3import { VideoModel } from './video'
4import { VideoChangeOwnership, VideoChangeOwnershipStatus } from '../../../shared/models/videos'
5import { getSort } from '../utils'
6import { VideoFileModel } from './video-file'
7
8enum ScopeNames {
9 FULL = 'FULL'
10}
11
12@Table({
13 tableName: 'videoChangeOwnership',
14 indexes: [
15 {
16 fields: ['videoId']
17 },
18 {
19 fields: ['initiatorAccountId']
20 },
21 {
22 fields: ['nextOwnerAccountId']
23 }
24 ]
25})
26@Scopes({
27 [ScopeNames.FULL]: {
28 include: [
29 {
30 model: () => AccountModel,
31 as: 'Initiator',
32 required: true
33 },
34 {
35 model: () => AccountModel,
36 as: 'NextOwner',
37 required: true
38 },
39 {
40 model: () => VideoModel,
41 required: true,
42 include: [{ model: () => VideoFileModel }]
43 }
44 ]
45 }
46})
47export class VideoChangeOwnershipModel extends Model<VideoChangeOwnershipModel> {
48 @CreatedAt
49 createdAt: Date
50
51 @UpdatedAt
52 updatedAt: Date
53
54 @AllowNull(false)
55 @Column
56 status: VideoChangeOwnershipStatus
57
58 @ForeignKey(() => AccountModel)
59 @Column
60 initiatorAccountId: number
61
62 @BelongsTo(() => AccountModel, {
63 foreignKey: {
64 name: 'initiatorAccountId',
65 allowNull: false
66 },
67 onDelete: 'cascade'
68 })
69 Initiator: AccountModel
70
71 @ForeignKey(() => AccountModel)
72 @Column
73 nextOwnerAccountId: number
74
75 @BelongsTo(() => AccountModel, {
76 foreignKey: {
77 name: 'nextOwnerAccountId',
78 allowNull: false
79 },
80 onDelete: 'cascade'
81 })
82 NextOwner: AccountModel
83
84 @ForeignKey(() => VideoModel)
85 @Column
86 videoId: number
87
88 @BelongsTo(() => VideoModel, {
89 foreignKey: {
90 allowNull: false
91 },
92 onDelete: 'cascade'
93 })
94 Video: VideoModel
95
96 static listForApi (nextOwnerId: number, start: number, count: number, sort: string) {
97 return VideoChangeOwnershipModel.scope(ScopeNames.FULL).findAndCountAll({
98 offset: start,
99 limit: count,
100 order: getSort(sort),
101 where: {
102 nextOwnerAccountId: nextOwnerId
103 }
104 })
105 .then(({ rows, count }) => ({ total: count, data: rows }))
106 }
107
108 static load (id: number) {
109 return VideoChangeOwnershipModel.scope(ScopeNames.FULL).findById(id)
110 }
111
112 toFormattedJSON (): VideoChangeOwnership {
113 return {
114 id: this.id,
115 status: this.status,
116 initiatorAccount: this.Initiator.toFormattedJSON(),
117 nextOwnerAccount: this.NextOwner.toFormattedJSON(),
118 video: {
119 id: this.Video.id,
120 uuid: this.Video.uuid,
121 url: this.Video.url,
122 name: this.Video.name
123 },
124 createdAt: this.createdAt
125 }
126 }
127}