Fix sort inconsistency

[github/Chocobozzz/PeerTube.git] / server / models / video / video-blacklist.ts

diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index 8c42dbc21fbb2dc74681e5bb7c9ea7e9cf17cd72..26167174abe8ff6234045ae0ab14897f6e64e234 100644 (file)
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,103 +1,80 @@
-import * as Sequelize from 'sequelize'
-
-import { addMethodsToModel, getSort } from '../utils'
-import {
-  BlacklistedVideoInstance,
-  BlacklistedVideoAttributes,
-
-  BlacklistedVideoMethods
-} from './video-blacklist-interface'
-
-let BlacklistedVideo: Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes>
-let toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
-let countTotal: BlacklistedVideoMethods.CountTotal
-let list: BlacklistedVideoMethods.List
-let listForApi: BlacklistedVideoMethods.ListForApi
-let loadById: BlacklistedVideoMethods.LoadById
-let loadByVideoId: BlacklistedVideoMethods.LoadByVideoId
-
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  BlacklistedVideo = sequelize.define<BlacklistedVideoInstance, BlacklistedVideoAttributes>('BlacklistedVideo',
-    {},
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { SortType } from '../../helpers/utils'
+import { getSortOnModel } from '../utils'
+import { VideoModel } from './video'
+
+@Table({
+  tableName: 'videoBlacklist',
+  indexes: [
     {
-      indexes: [
-        {
-          fields: [ 'videoId' ],
-          unique: true
-        }
-      ]
+      fields: [ 'videoId' ],
+      unique: true
     }
-  )
-
-  const classMethods = [
-    associate,
-
-    countTotal,
-    list,
-    listForApi,
-    loadById,
-    loadByVideoId
   ]
-  const instanceMethods = [
-    toFormatedJSON
-  ]
-  addMethodsToModel(BlacklistedVideo, classMethods, instanceMethods)
+})
+export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
 
-  return BlacklistedVideo
-}
+  @CreatedAt
+  createdAt: Date
 
-// ------------------------------ METHODS ------------------------------
+  @UpdatedAt
+  updatedAt: Date
 
-toFormatedJSON = function (this: BlacklistedVideoInstance) {
-  return {
-    id: this.id,
-    videoId: this.videoId,
-    createdAt: this.createdAt
-  }
-}
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
 
-// ------------------------------ STATICS ------------------------------
-
-function associate (models) {
-  BlacklistedVideo.belongsTo(models.Video, {
-    foreignKey: 'videoId',
+  @BelongsTo(() => VideoModel, {
+    foreignKey: {
+      allowNull: false
+    },
     onDelete: 'cascade'
   })
-}
-
-countTotal = function () {
-  return BlacklistedVideo.count()
-}
-
-list = function () {
-  return BlacklistedVideo.findAll()
-}
+  Video: VideoModel
+
+  static listForApi (start: number, count: number, sort: SortType) {
+    const query = {
+      offset: start,
+      limit: count,
+      order: getSortOnModel(sort.sortModel, sort.sortValue),
+      include: [ { model: VideoModel } ]
+    }
 
-listForApi = function (start: number, count: number, sort: string) {
-  const query = {
-    offset: start,
-    limit: count,
-    order: [ getSort(sort) ]
+    return VideoBlacklistModel.findAndCountAll(query)
+      .then(({ rows, count }) => {
+        return {
+          data: rows,
+          total: count
+        }
+      })
   }
 
-  return BlacklistedVideo.findAndCountAll(query).then(({ rows, count }) => {
-    return {
-      data: rows,
-      total: count
+  static loadByVideoId (id: number) {
+    const query = {
+      where: {
+        videoId: id
+      }
     }
-  })
-}
 
-loadById = function (id: number) {
-  return BlacklistedVideo.findById(id)
-}
+    return VideoBlacklistModel.findOne(query)
+  }
 
-loadByVideoId = function (id: string) {
-  const query = {
-    where: {
-      videoId: id
+  toFormattedJSON () {
+    const video = this.Video
+
+    return {
+      id: this.id,
+      videoId: this.videoId,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+      name: video.name,
+      uuid: video.uuid,
+      description: video.description,
+      duration: video.duration,
+      views: video.views,
+      likes: video.likes,
+      dislikes: video.dislikes,
+      nsfw: video.nsfw
     }
   }
-
-  return BlacklistedVideo.findOne(query)
 }