refactor: lib/models

- move all interfaces to baseModel.ts
- remove unused import

Author: a60814billy

lib/models/author.ts

@@ -1,11 +1,7 @@
 // external modules
 
 import {Model, DataTypes} from "sequelize";
-
-export interface AuthorAttributes {
-  id: string
-  color: string
-}
+import {AuthorAttributes} from "./baseModel";
 
 export class Author extends Model<AuthorAttributes> implements AuthorAttributes {
   color: string;

lib/models/baseModel.ts

@@ -20,3 +20,71 @@ export interface BaseModelStatic extends Model {
 
   associate(models: any): void
 }
+
+export interface AuthorAttributes {
+  id: string
+  color: string
+}
+
+export interface NoteAttributes {
+  id?: string
+  shortid?: string
+  alias?: string
+  permission?: string
+  viewcount?: number
+  title?: string
+  content?: string
+  authorship?: string
+  lastchangeAt?: Date
+  savedAt?: Date
+
+  ownerId?: string
+}
+
+export interface RevisionAttributes {
+  id: string
+  patch: string
+  lastContent: string
+  content: string
+  length: number
+  authorship: string
+}
+
+export interface BaseProfile {
+  provider: string
+}
+
+export interface GenericProfile extends BaseProfile {
+  provider: string
+  displayName?: string
+  username?: string
+  id?: string
+  photos?: { value: string }[]
+  avatarUrl?: string
+  emails?: string[]
+  photo?: string
+  email?: string
+}
+
+export interface DropboxProfile extends BaseProfile {
+  provider: 'dropbox'
+  emails?: { value: string }[]
+}
+
+export interface UserProfile {
+  name: string
+  photo: string
+  biggerphoto: string
+}
+
+export interface UserAttributes {
+  id: string
+  profileid?: string
+  profile?: string
+  history?: string
+  accessToken?: string
+  refreshToken?: string
+  deleteToken?: string
+  email?: string
+  password?: string
+}

lib/models/index.ts

@@ -1,6 +1,4 @@
 // external modules
-import * as fs from "fs";
-import * as path from "path";
 import {Model, Sequelize} from "sequelize";
 import {cloneDeep} from "lodash";
 
@@ -9,15 +7,15 @@ import config from "../config";
 import {logger} from "../logger";
 
 
-import {BaseModel} from "./baseModel";
+import {BaseModel, AuthorAttributes, NoteAttributes, RevisionAttributes, UserAttributes, GenericProfile} from "./baseModel";
 
-import {Author, AuthorAttributes} from './author'
-import {User, UserAttributes} from './user'
-import {Revision, RevisionAttributes} from "./revision";
-import {Note, NoteAttributes} from './note'
+import {Author} from './author'
+import {User} from './user'
+import {Revision} from "./revision";
+import {Note} from './note'
 
 export {Author, User, Revision, Note}
-export {AuthorAttributes, UserAttributes, RevisionAttributes, NoteAttributes}
+export {AuthorAttributes, UserAttributes, RevisionAttributes, NoteAttributes, GenericProfile}
 
 const dbconfig = cloneDeep(config.db)
 dbconfig.logging = config.debug ? (data) => {

lib/models/note.ts

@@ -20,28 +20,13 @@ import config from "../config";
 import {logger} from "../logger";
 import {createNoteWithRevision, syncNote} from "../services/note";
 import {stripTags} from "../string";
-import {MySequelize} from "./baseModel";
+import {MySequelize, NoteAttributes} from "./baseModel";
 
 const md = markdownIt()
 export const dmp = new DiffMatchPatch()
 // permission types
 const permissionTypes = ['freely', 'editable', 'limited', 'locked', 'protected', 'private']
 
-export interface NoteAttributes {
-  id?: string
-  shortid?: string
-  alias?: string
-  permission?: string
-  viewcount?: number
-  title?: string
-  content?: string
-  authorship?: string
-  lastchangeAt?: Date
-  savedAt?: Date
-
-  ownerId?: string
-}
-
 export class Note extends Model<NoteAttributes> implements NoteAttributes {
   alias: string;
   authorship: string;

lib/models/revision.ts

@@ -1,6 +1,5 @@
 // external modules
-import {Model, Sequelize, Op, DataTypes} from "sequelize";
-import async from "async";
+import {Model, Op, DataTypes} from "sequelize";
 import moment from "moment";
 import * as  childProcess from "child_process";
 import shortId from "shortid";
@@ -10,7 +9,7 @@ import * as  util from "util";
 // core
 import config from "../config";
 import logger from "../logger";
-import {MySequelize} from "./baseModel";
+import {MySequelize, RevisionAttributes} from "./baseModel";
 
 let dmpWorker = createDmpWorker()
 const dmpCallbackCache = {}
@@ -54,15 +53,6 @@ function sendDmpWorker(data, callback) {
 }
 
 
-export interface RevisionAttributes {
-  id: string
-  patch: string
-  lastContent: string
-  content: string
-  length: number
-  authorship: string
-}
-
 export class Revision extends Model<RevisionAttributes> implements RevisionAttributes {
   authorship: string;
   content: string;

lib/models/user.ts

@@ -3,46 +3,7 @@ import Scrypt from "scrypt-kdf";
 
 import {logger} from "../logger";
 import {generateAvatarURL} from "../letter-avatars";
-
-
-interface BaseProfile {
-  provider: string
-}
-
-interface DropboxProfile extends BaseProfile {
-  provider: 'dropbox'
-  emails?: { value: string }[]
-}
-
-interface GenericProfile extends BaseProfile {
-  provider: string
-  displayName?: string
-  username?: string
-  id?: string
-  photos?: { value: string }[]
-  avatarUrl?: string
-  emails?: string[]
-  photo?: string
-  email?: string
-}
-
-interface UserProfile {
-  name: string
-  photo: string
-  biggerphoto: string
-}
-
-export interface UserAttributes {
-  id: string
-  profileid?: string
-  profile?: string
-  history?: string
-  accessToken?: string
-  refreshToken?: string
-  deleteToken?: string
-  email?: string
-  password?: string
-}
+import {BaseProfile, DropboxProfile, GenericProfile, UserAttributes, UserProfile} from "./baseModel";
 
 export class User extends Model<UserAttributes> implements UserAttributes {
   accessToken: string;