diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-18 11:28:17 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:20 +0200 |
commit | 1735c825726edaa0af5035cb6cbb0cc0db502c6d (patch) | |
tree | 7bbb442f2cb4d7be58a4e08d87f5974403a3047c /server/models/video/video-playlist-element.ts | |
parent | e8bafea35bc930cb8ac5b2d521a188642a1adffe (diff) | |
download | PeerTube-1735c825726edaa0af5035cb6cbb0cc0db502c6d.tar.gz PeerTube-1735c825726edaa0af5035cb6cbb0cc0db502c6d.tar.zst PeerTube-1735c825726edaa0af5035cb6cbb0cc0db502c6d.zip |
Update sequelize
Diffstat (limited to 'server/models/video/video-playlist-element.ts')
-rw-r--r-- | server/models/video/video-playlist-element.ts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts index 3396b1136..eeb3d6bbd 100644 --- a/server/models/video/video-playlist-element.ts +++ b/server/models/video/video-playlist-element.ts | |||
@@ -15,12 +15,12 @@ import { | |||
15 | } from 'sequelize-typescript' | 15 | } from 'sequelize-typescript' |
16 | import { VideoModel } from './video' | 16 | import { VideoModel } from './video' |
17 | import { VideoPlaylistModel } from './video-playlist' | 17 | import { VideoPlaylistModel } from './video-playlist' |
18 | import * as Sequelize from 'sequelize' | ||
19 | import { getSort, throwIfNotValid } from '../utils' | 18 | import { getSort, throwIfNotValid } from '../utils' |
20 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' | 19 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' |
21 | import { CONSTRAINTS_FIELDS } from '../../initializers/constants' | 20 | import { CONSTRAINTS_FIELDS } from '../../initializers/constants' |
22 | import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' | 21 | import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' |
23 | import * as validator from 'validator' | 22 | import * as validator from 'validator' |
23 | import { AggregateOptions, Op, Sequelize, Transaction } from 'sequelize' | ||
24 | 24 | ||
25 | @Table({ | 25 | @Table({ |
26 | tableName: 'videoPlaylistElement', | 26 | tableName: 'videoPlaylistElement', |
@@ -96,7 +96,7 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
96 | }) | 96 | }) |
97 | Video: VideoModel | 97 | Video: VideoModel |
98 | 98 | ||
99 | static deleteAllOf (videoPlaylistId: number, transaction?: Sequelize.Transaction) { | 99 | static deleteAllOf (videoPlaylistId: number, transaction?: Transaction) { |
100 | const query = { | 100 | const query = { |
101 | where: { | 101 | where: { |
102 | videoPlaylistId | 102 | videoPlaylistId |
@@ -140,7 +140,7 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
140 | return VideoPlaylistElementModel.findOne(query) | 140 | return VideoPlaylistElementModel.findOne(query) |
141 | } | 141 | } |
142 | 142 | ||
143 | static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Sequelize.Transaction) { | 143 | static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Transaction) { |
144 | const query = { | 144 | const query = { |
145 | attributes: [ 'url' ], | 145 | attributes: [ 'url' ], |
146 | offset: start, | 146 | offset: start, |
@@ -159,8 +159,8 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
159 | }) | 159 | }) |
160 | } | 160 | } |
161 | 161 | ||
162 | static getNextPositionOf (videoPlaylistId: number, transaction?: Sequelize.Transaction) { | 162 | static getNextPositionOf (videoPlaylistId: number, transaction?: Transaction) { |
163 | const query = { | 163 | const query: AggregateOptions<number> = { |
164 | where: { | 164 | where: { |
165 | videoPlaylistId | 165 | videoPlaylistId |
166 | }, | 166 | }, |
@@ -176,14 +176,14 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
176 | firstPosition: number, | 176 | firstPosition: number, |
177 | endPosition: number, | 177 | endPosition: number, |
178 | newPosition: number, | 178 | newPosition: number, |
179 | transaction?: Sequelize.Transaction | 179 | transaction?: Transaction |
180 | ) { | 180 | ) { |
181 | const query = { | 181 | const query = { |
182 | where: { | 182 | where: { |
183 | videoPlaylistId, | 183 | videoPlaylistId, |
184 | position: { | 184 | position: { |
185 | [Sequelize.Op.gte]: firstPosition, | 185 | [Op.gte]: firstPosition, |
186 | [Sequelize.Op.lte]: endPosition | 186 | [Op.lte]: endPosition |
187 | } | 187 | } |
188 | }, | 188 | }, |
189 | transaction, | 189 | transaction, |
@@ -198,13 +198,13 @@ export class VideoPlaylistElementModel extends Model<VideoPlaylistElementModel> | |||
198 | fromPosition: number, | 198 | fromPosition: number, |
199 | toPosition?: number, | 199 | toPosition?: number, |
200 | by = 1, | 200 | by = 1, |
201 | transaction?: Sequelize.Transaction | 201 | transaction?: Transaction |
202 | ) { | 202 | ) { |
203 | const query = { | 203 | const query = { |
204 | where: { | 204 | where: { |
205 | videoPlaylistId, | 205 | videoPlaylistId, |
206 | position: { | 206 | position: { |
207 | [Sequelize.Op.gte]: fromPosition | 207 | [Op.gte]: fromPosition |
208 | } | 208 | } |
209 | }, | 209 | }, |
210 | transaction | 210 | transaction |