X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodels%2Fvideo%2Fvideo-view.ts;h=d72df100f105910abcf4dc3c35a103d75d854d5b;hb=c3edc5b074aa4bb1861ed0a94d3713808e87170f;hp=992cf258a1468dfd8e94e81372fbf341167bb28c;hpb=b49f22d8f9a52ab75fd38db2d377249eb58fa678;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts index 992cf258a..d72df100f 100644 --- a/server/models/video/video-view.ts +++ b/server/models/video/video-view.ts @@ -1,6 +1,7 @@ -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/typescript-utils' import { VideoModel } from './video' -import * as Sequelize from 'sequelize' @Table({ tableName: 'videoView', @@ -14,16 +15,16 @@ import * as Sequelize from 'sequelize' } ] }) -export class VideoViewModel extends Model { +export class VideoViewModel extends Model>> { @CreatedAt createdAt: Date @AllowNull(false) - @Column(Sequelize.DATE) + @Column(DataType.DATE) startDate: Date @AllowNull(false) - @Column(Sequelize.DATE) + @Column(DataType.DATE) endDate: Date @AllowNull(false) @@ -46,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)') } } }