From 3fd3ab2d34d512b160a5e6084d7609be7b4f4452 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Dec 2017 17:53:50 +0100 Subject: Move models to typescript-sequelize --- server/initializers/database.ts | 186 ++++++++++++---------------------------- 1 file changed, 53 insertions(+), 133 deletions(-) (limited to 'server/initializers/database.ts') diff --git a/server/initializers/database.ts b/server/initializers/database.ts index bb95992e1..f9e24c6b8 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -1,72 +1,43 @@ -import { join } from 'path' -import { flattenDepth } from 'lodash' -require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string -import * as Sequelize from 'sequelize' -import { AvatarModel } from '../models/avatar' +import { Sequelize as SequelizeTypescript } from 'sequelize-typescript' +import { isTestInstance } from '../helpers/core-utils' +import { logger } from '../helpers/logger' +import { AccountModel } from '../models/account/account' +import { AccountFollowModel } from '../models/account/account-follow' +import { AccountVideoRateModel } from '../models/account/account-video-rate' +import { UserModel } from '../models/account/user' +import { ApplicationModel } from '../models/application/application' +import { AvatarModel } from '../models/avatar/avatar' +import { JobModel } from '../models/job/job' +import { OAuthClientModel } from '../models/oauth/oauth-client' +import { OAuthTokenModel } from '../models/oauth/oauth-token' +import { ServerModel } from '../models/server/server' +import { TagModel } from '../models/video/tag' +import { VideoModel } from '../models/video/video' +import { VideoAbuseModel } from '../models/video/video-abuse' +import { VideoBlacklistModel } from '../models/video/video-blacklist' +import { VideoChannelModel } from '../models/video/video-channel' +import { VideoChannelShareModel } from '../models/video/video-channel-share' +import { VideoFileModel } from '../models/video/video-file' +import { VideoShareModel } from '../models/video/video-share' +import { VideoTagModel } from '../models/video/video-tag' import { CONFIG } from './constants' -// Do not use barrel, we need to load database first -import { logger } from '../helpers/logger' -import { isTestInstance, readdirPromise } from '../helpers/core-utils' -import { VideoModel } from './../models/video/video-interface' -import { VideoTagModel } from './../models/video/video-tag-interface' -import { BlacklistedVideoModel } from './../models/video/video-blacklist-interface' -import { VideoFileModel } from './../models/video/video-file-interface' -import { VideoAbuseModel } from './../models/video/video-abuse-interface' -import { VideoChannelModel } from './../models/video/video-channel-interface' -import { UserModel } from '../models/account/user-interface' -import { AccountVideoRateModel } from '../models/account/account-video-rate-interface' -import { AccountFollowModel } from '../models/account/account-follow-interface' -import { TagModel } from './../models/video/tag-interface' -import { ServerModel } from '../models/server/server-interface' -import { OAuthTokenModel } from './../models/oauth/oauth-token-interface' -import { OAuthClientModel } from './../models/oauth/oauth-client-interface' -import { JobModel } from './../models/job/job-interface' -import { AccountModel } from './../models/account/account-interface' -import { ApplicationModel } from './../models/application/application-interface' -import { VideoChannelShareModel } from '../models/video/video-channel-share-interface' -import { VideoShareModel } from '../models/video/video-share-interface' +require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string const dbname = CONFIG.DATABASE.DBNAME const username = CONFIG.DATABASE.USERNAME const password = CONFIG.DATABASE.PASSWORD -export type PeerTubeDatabase = { - sequelize?: Sequelize.Sequelize, - init?: (silent: boolean) => Promise, - - Application?: ApplicationModel, - Avatar?: AvatarModel, - Account?: AccountModel, - Job?: JobModel, - OAuthClient?: OAuthClientModel, - OAuthToken?: OAuthTokenModel, - Server?: ServerModel, - Tag?: TagModel, - AccountVideoRate?: AccountVideoRateModel, - AccountFollow?: AccountFollowModel, - User?: UserModel, - VideoAbuse?: VideoAbuseModel, - VideoChannel?: VideoChannelModel, - VideoChannelShare?: VideoChannelShareModel, - VideoShare?: VideoShareModel, - VideoFile?: VideoFileModel, - BlacklistedVideo?: BlacklistedVideoModel, - VideoTag?: VideoTagModel, - Video?: VideoModel -} - -const database: PeerTubeDatabase = {} - -const sequelize = new Sequelize(dbname, username, password, { +const sequelizeTypescript = new SequelizeTypescript({ + database: dbname, dialect: 'postgres', - host: CONFIG.DATABASE.HOSTNAME, - port: CONFIG.DATABASE.PORT, + username, + password, + modelPaths: [__dirname + '/models'], benchmark: isTestInstance(), - isolationLevel: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE, + isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE, operatorsAliases: false, - logging: (message: string, benchmark: number) => { if (process.env.NODE_DB_LOG === 'false') return @@ -79,34 +50,28 @@ const sequelize = new Sequelize(dbname, username, password, { } }) -database.sequelize = sequelize - -database.init = async (silent: boolean) => { - const modelDirectory = join(__dirname, '..', 'models') - - const filePaths = await getModelFiles(modelDirectory) - - for (const filePath of filePaths) { - try { - const model = sequelize.import(filePath) - - database[model['name']] = model - } catch (err) { - logger.error('Cannot import database model %s.', filePath, err) - process.exit(0) - } - } - - for (const modelName of Object.keys(database)) { - if ('associate' in database[modelName]) { - try { - database[modelName].associate(database) - } catch (err) { - logger.error('Cannot associate model %s.', modelName, err) - process.exit(0) - } - } - } +async function initDatabase (silent: boolean) { + sequelizeTypescript.addModels([ + ApplicationModel, + AvatarModel, + AccountModel, + JobModel, + OAuthClientModel, + OAuthTokenModel, + ServerModel, + TagModel, + AccountVideoRateModel, + AccountFollowModel, + UserModel, + VideoAbuseModel, + VideoChannelModel, + VideoChannelShareModel, + VideoShareModel, + VideoFileModel, + VideoBlacklistModel, + VideoTagModel, + VideoModel + ]) if (!silent) logger.info('Database %s is ready.', dbname) @@ -116,51 +81,6 @@ database.init = async (silent: boolean) => { // --------------------------------------------------------------------------- export { - database -} - -// --------------------------------------------------------------------------- - -async function getModelFiles (modelDirectory: string) { - const files = await readdirPromise(modelDirectory) - const directories = files.filter(directory => { - // Find directories - if ( - directory.endsWith('.js.map') || - directory === 'index.js' || directory === 'index.ts' || - directory === 'utils.js' || directory === 'utils.ts' - ) return false - - return true - }) - - const tasks: Promise[] = [] - - // For each directory we read it and append model in the modelFilePaths array - for (const directory of directories) { - const modelDirectoryPath = join(modelDirectory, directory) - - const promise = readdirPromise(modelDirectoryPath) - .then(files => { - const filteredFiles = files - .filter(file => { - if ( - file === 'index.js' || file === 'index.ts' || - file === 'utils.js' || file === 'utils.ts' || - file.endsWith('-interface.js') || file.endsWith('-interface.ts') || - file.endsWith('.js.map') - ) return false - - return true - }) - .map(file => join(modelDirectoryPath, file)) - - return filteredFiles - }) - - tasks.push(promise) - } - - const filteredFilesArray: string[][] = await Promise.all(tasks) - return flattenDepth(filteredFilesArray, 1) + initDatabase, + sequelizeTypescript } -- cgit v1.2.3