X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-view.ts;h=d72df100f105910abcf4dc3c35a103d75d854d5b;hb=c3edc5b074aa4bb1861ed0a94d3713808e87170f;hp=dfc6296ce2618f1bbb64cbab15e0beb5b34a8645;hpb=5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts
index dfc6296ce..d72df100f 100644
--- a/server/models/video/video-view.ts
+++ b/server/models/video/video-view.ts
@@ -1,6 +1,6 @@
-import * as Sequelize from 'sequelize'
-import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript'
-import { AttributesOnly } from '@shared/core-utils'
+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'
 
 @Table({
@@ -20,11 +20,11 @@ export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>
   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<Partial<AttributesOnly<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)')
         }
       }
     }