From fd261a8de933779480d631891efd2ac289045f2f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 15 Jun 2020 15:18:54 +0200 Subject: Fix video view filename --- server/initializers/database.ts | 2 +- server/lib/job-queue/handlers/video-views.ts | 2 +- .../lib/schedulers/remove-old-views-scheduler.ts | 2 +- server/models/video/video-view.ts | 59 ++++++++++++++++++++++ server/models/video/video-views.ts | 59 ---------------------- server/models/video/video.ts | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 server/models/video/video-view.ts delete mode 100644 server/models/video/video-views.ts (limited to 'server') diff --git a/server/initializers/database.ts b/server/initializers/database.ts index eedaf3c4e..633d4f956 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -25,7 +25,7 @@ import { CONFIG } from './config' import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update' import { VideoCaptionModel } from '../models/video/video-caption' import { VideoImportModel } from '../models/video/video-import' -import { VideoViewModel } from '../models/video/video-views' +import { VideoViewModel } from '../models/video/video-view' import { VideoChangeOwnershipModel } from '../models/video/video-change-ownership' import { VideoRedundancyModel } from '../models/redundancy/video-redundancy' import { UserVideoHistoryModel } from '../models/account/user-video-history' diff --git a/server/lib/job-queue/handlers/video-views.ts b/server/lib/job-queue/handlers/video-views.ts index 7211df237..897235ec0 100644 --- a/server/lib/job-queue/handlers/video-views.ts +++ b/server/lib/job-queue/handlers/video-views.ts @@ -1,7 +1,7 @@ import { Redis } from '../../redis' import { logger } from '../../../helpers/logger' import { VideoModel } from '../../../models/video/video' -import { VideoViewModel } from '../../../models/video/video-views' +import { VideoViewModel } from '../../../models/video/video-view' import { isTestInstance } from '../../../helpers/core-utils' import { federateVideoIfNeeded } from '../../activitypub/videos' diff --git a/server/lib/schedulers/remove-old-views-scheduler.ts b/server/lib/schedulers/remove-old-views-scheduler.ts index 5ae87fe50..73577a421 100644 --- a/server/lib/schedulers/remove-old-views-scheduler.ts +++ b/server/lib/schedulers/remove-old-views-scheduler.ts @@ -2,7 +2,7 @@ import { logger } from '../../helpers/logger' import { AbstractScheduler } from './abstract-scheduler' import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants' import { CONFIG } from '../../initializers/config' -import { VideoViewModel } from '../../models/video/video-views' +import { VideoViewModel } from '../../models/video/video-view' export class RemoveOldViewsScheduler extends AbstractScheduler { diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts new file mode 100644 index 000000000..40db5effd --- /dev/null +++ b/server/models/video/video-view.ts @@ -0,0 +1,59 @@ +import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript' +import { VideoModel } from './video' +import * as Sequelize from 'sequelize' + +@Table({ + tableName: 'videoView', + updatedAt: false, + indexes: [ + { + fields: [ 'videoId' ] + }, + { + fields: [ 'startDate' ] + } + ] +}) +export class VideoViewModel extends Model { + @CreatedAt + createdAt: Date + + @AllowNull(false) + @Column(Sequelize.DATE) + startDate: Date + + @AllowNull(false) + @Column(Sequelize.DATE) + endDate: Date + + @AllowNull(false) + @Column + views: number + + @ForeignKey(() => VideoModel) + @Column + videoId: number + + @BelongsTo(() => VideoModel, { + foreignKey: { + allowNull: false + }, + onDelete: 'CASCADE' + }) + Video: VideoModel + + static removeOldRemoteViewsHistory (beforeDate: string) { + const query = { + where: { + startDate: { + [Sequelize.Op.lt]: beforeDate + }, + videoId: { + [Sequelize.Op.in]: Sequelize.literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)') + } + } + } + + return VideoViewModel.destroy(query) + } +} diff --git a/server/models/video/video-views.ts b/server/models/video/video-views.ts deleted file mode 100644 index 40db5effd..000000000 --- a/server/models/video/video-views.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript' -import { VideoModel } from './video' -import * as Sequelize from 'sequelize' - -@Table({ - tableName: 'videoView', - updatedAt: false, - indexes: [ - { - fields: [ 'videoId' ] - }, - { - fields: [ 'startDate' ] - } - ] -}) -export class VideoViewModel extends Model { - @CreatedAt - createdAt: Date - - @AllowNull(false) - @Column(Sequelize.DATE) - startDate: Date - - @AllowNull(false) - @Column(Sequelize.DATE) - endDate: Date - - @AllowNull(false) - @Column - views: number - - @ForeignKey(() => VideoModel) - @Column - videoId: number - - @BelongsTo(() => VideoModel, { - foreignKey: { - allowNull: false - }, - onDelete: 'CASCADE' - }) - Video: VideoModel - - static removeOldRemoteViewsHistory (beforeDate: string) { - const query = { - where: { - startDate: { - [Sequelize.Op.lt]: beforeDate - }, - videoId: { - [Sequelize.Op.in]: Sequelize.literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)') - } - } - } - - return VideoViewModel.destroy(query) - } -} diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 5aa40220e..ae2483b2f 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -76,7 +76,7 @@ import { ScheduleVideoUpdateModel } from './schedule-video-update' import { VideoCaptionModel } from './video-caption' import { VideoBlacklistModel } from './video-blacklist' import { remove } from 'fs-extra' -import { VideoViewModel } from './video-views' +import { VideoViewModel } from './video-view' import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { videoFilesModelToFormattedJSON, -- cgit v1.2.3