X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-view.ts;h=b51f0f84d103b7c648ed2cd1fed9667f74650ae8;hb=17ddba4950d72e07968a3e87e9ea68b7c61f5b97;hp=40db5effdbf54507c870f1c011d61128dafa1694;hpb=fd261a8de933779480d631891efd2ac289045f2f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts
index 40db5effd..b51f0f84d 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/core-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<VideoViewModel> {
+export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>>> {
   @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<VideoViewModel> {
     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)')
         }
       }
     }