X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-blacklist.ts;h=d9fe9dfc964ed9dc861aa132e8a7a74d3371cbb0;hb=b876eaf11a1ed9683664d94767ca684ba5b77753;hp=1c279b1baefdb6eaa9edbc4313b5ecf2377b3ff0;hpb=792dbaf07f83fbe3f1d209cd9edf190442c7d2f3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index 1c279b1ba..d9fe9dfc9 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,122 +1,108 @@
-import * as Sequelize from 'sequelize'
-
-import { SortType } from '../../helpers'
-import { addMethodsToModel, getSortOnModel } from '../utils'
-import { VideoInstance } from './video-interface'
-import {
-  BlacklistedVideoInstance,
-  BlacklistedVideoAttributes,
-
-  BlacklistedVideoMethods
-} from './video-blacklist-interface'
-
-let BlacklistedVideo: Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes>
-let toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
-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 { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { getSortOnModel, SortType, throwIfNotValid } from '../utils'
+import { VideoModel } from './video'
+import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel'
+import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist'
+import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { FindOptions } from 'sequelize'
+
+@Table({
+  tableName: 'videoBlacklist',
+  indexes: [
     {
-      indexes: [
-        {
-          fields: [ 'videoId' ],
-          unique: true
-        }
-      ]
+      fields: [ 'videoId' ],
+      unique: true
     }
-  )
-
-  const classMethods = [
-    associate,
-
-    countTotal,
-    list,
-    listForApi,
-    loadById,
-    loadByVideoId
-  ]
-  const instanceMethods = [
-    toFormattedJSON
   ]
-  addMethodsToModel(BlacklistedVideo, classMethods, instanceMethods)
+})
+export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
 
-  return BlacklistedVideo
-}
+  @AllowNull(true)
+  @Is('VideoBlacklistReason', value => throwIfNotValid(value, isVideoBlacklistReasonValid, 'reason', true))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_BLACKLIST.REASON.max))
+  reason: string
 
-// ------------------------------ METHODS ------------------------------
+  @AllowNull(false)
+  @Column
+  unfederated: boolean
 
-toFormattedJSON = function (this: BlacklistedVideoInstance) {
-  let video: VideoInstance
+  @AllowNull(false)
+  @Default(null)
+  @Is('VideoBlacklistType', value => throwIfNotValid(value, isVideoBlacklistTypeValid, 'type'))
+  @Column
+  type: VideoBlacklistType
 
-  video = this.Video
+  @CreatedAt
+  createdAt: Date
 
-  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
-  }
-}
+  @UpdatedAt
+  updatedAt: Date
 
-// ------------------------------ STATICS ------------------------------
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
 
-function associate (models) {
-  BlacklistedVideo.belongsTo(models.Video, {
+  @BelongsTo(() => VideoModel, {
     foreignKey: {
-      name: 'videoId',
       allowNull: false
     },
-    onDelete: 'CASCADE'
+    onDelete: 'cascade'
   })
-}
-
-countTotal = function () {
-  return BlacklistedVideo.count()
-}
+  Video: VideoModel
+
+  static listForApi (start: number, count: number, sort: SortType, type?: VideoBlacklistType) {
+    const query: FindOptions = {
+      offset: start,
+      limit: count,
+      order: getSortOnModel(sort.sortModel, sort.sortValue),
+      include: [
+        {
+          model: VideoModel,
+          required: true,
+          include: [
+            {
+              model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, true ] }),
+              required: true
+            }
+          ]
+        }
+      ]
+    }
 
-list = function () {
-  return BlacklistedVideo.findAll()
-}
+    if (type) {
+      query.where = { type }
+    }
 
-listForApi = function (start: number, count: number, sort: SortType) {
-  const query = {
-    offset: start,
-    limit: count,
-    order: [ getSortOnModel(sort.sortModel, sort.sortValue) ],
-    include: [ { model: BlacklistedVideo['sequelize'].models.Video } ]
+    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: number) {
-  const query = {
-    where: {
-      videoId: id
+  toFormattedJSON (): VideoBlacklist {
+    return {
+      id: this.id,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+      reason: this.reason,
+      unfederated: this.unfederated,
+      type: this.type,
+
+      video: this.Video.toFormattedJSON()
     }
   }
-
-  return BlacklistedVideo.findOne(query)
 }