X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-view.ts;h=b51f0f84d103b7c648ed2cd1fed9667f74650ae8;hb=17ddba4950d72e07968a3e87e9ea68b7c61f5b97;hp=dfc6296ce2618f1bbb64cbab15e0beb5b34a8645;hpb=8ee37c5f38b0f9b7e97239197d5590109c163250;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts index dfc6296ce..b51f0f84d 100644 --- a/server/models/video/video-view.ts +++ b/server/models/video/video-view.ts @@ -1,5 +1,5 @@ -import * as Sequelize from 'sequelize' -import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript' +import { literal, Op } from 'sequelize' +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Model, Table } from 'sequelize-typescript' import { AttributesOnly } from '@shared/core-utils' import { VideoModel } from './video' @@ -20,11 +20,11 @@ export class VideoViewModel extends Model createdAt: Date @AllowNull(false) - @Column(Sequelize.DATE) + @Column(DataType.DATE) startDate: Date @AllowNull(false) - @Column(Sequelize.DATE) + @Column(DataType.DATE) endDate: Date @AllowNull(false) @@ -47,10 +47,10 @@ export class VideoViewModel extends Model const query = { where: { startDate: { - [Sequelize.Op.lt]: beforeDate + [Op.lt]: beforeDate }, videoId: { - [Sequelize.Op.in]: Sequelize.literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)') + [Op.in]: literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)') } } }