Clean out old unused functions, Device updates for replacing DeviceInfo

server/models/CustomMetadataProvider.js

@@ -30,6 +30,61 @@ class CustomMetadataProvider extends Model {
     this.updatedAt
   }
 
+  /**
+   * Get providers for client by media type
+   * Currently only available for "book" media type
+   *
+   * @param {string} mediaType
+   * @returns {Promise<ClientCustomMetadataProvider[]>}
+   */
+  static async getForClientByMediaType(mediaType) {
+    if (mediaType !== 'book') return []
+    const customMetadataProviders = await this.findAll({
+      where: {
+        mediaType
+      }
+    })
+    return customMetadataProviders.map((cmp) => cmp.toClientJson())
+  }
+
+  /**
+   * Check if provider exists by slug
+   *
+   * @param {string} providerSlug
+   * @returns {Promise<boolean>}
+   */
+  static async checkExistsBySlug(providerSlug) {
+    const providerId = providerSlug?.split?.('custom-')[1]
+    if (!providerId) return false
+
+    return (await this.count({ where: { id: providerId } })) > 0
+  }
+
+  /**
+   * Initialize model
+   * @param {import('../Database').sequelize} sequelize
+   */
+  static init(sequelize) {
+    super.init(
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true
+        },
+        name: DataTypes.STRING,
+        mediaType: DataTypes.STRING,
+        url: DataTypes.STRING,
+        authHeaderValue: DataTypes.STRING,
+        extraData: DataTypes.JSON
+      },
+      {
+        sequelize,
+        modelName: 'customMetadataProvider'
+      }
+    )
+  }
+
   getSlug() {
     return `custom-${this.id}`
   }
@@ -46,58 +101,6 @@ class CustomMetadataProvider extends Model {
       slug: this.getSlug()
     }
   }
-
-  /**
-   * Get providers for client by media type
-   * Currently only available for "book" media type
-   * 
-   * @param {string} mediaType 
-   * @returns {Promise<ClientCustomMetadataProvider[]>}
-   */
-  static async getForClientByMediaType(mediaType) {
-    if (mediaType !== 'book') return []
-    const customMetadataProviders = await this.findAll({
-      where: {
-        mediaType
-      }
-    })
-    return customMetadataProviders.map(cmp => cmp.toClientJson())
-  }
-
-  /**
-   * Check if provider exists by slug
-   * 
-   * @param {string} providerSlug 
-   * @returns {Promise<boolean>}
-   */
-  static async checkExistsBySlug(providerSlug) {
-    const providerId = providerSlug?.split?.('custom-')[1]
-    if (!providerId) return false
-
-    return (await this.count({ where: { id: providerId } })) > 0
-  }
-
-  /**
-   * Initialize model
-   * @param {import('../Database').sequelize} sequelize 
-   */
-  static init(sequelize) {
-    super.init({
-      id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true
-      },
-      name: DataTypes.STRING,
-      mediaType: DataTypes.STRING,
-      url: DataTypes.STRING,
-      authHeaderValue: DataTypes.STRING,
-      extraData: DataTypes.JSON
-    }, {
-      sequelize,
-      modelName: 'customMetadataProvider'
-    })
-  }
 }
 
-module.exports = CustomMetadataProvider
+module.exports = CustomMetadataProvider

server/models/Device.js

@@ -29,33 +29,6 @@ class Device extends Model {
     this.updatedAt
   }
 
-  getOldDevice() {
-    let browserVersion = null
-    let sdkVersion = null
-    if (this.clientName === 'Abs Android') {
-      sdkVersion = this.deviceVersion || null
-    } else {
-      browserVersion = this.deviceVersion || null
-    }
-
-    return new oldDevice({
-      id: this.id,
-      deviceId: this.deviceId,
-      userId: this.userId,
-      ipAddress: this.ipAddress,
-      browserName: this.extraData.browserName || null,
-      browserVersion,
-      osName: this.extraData.osName || null,
-      osVersion: this.extraData.osVersion || null,
-      clientVersion: this.clientVersion || null,
-      manufacturer: this.extraData.manufacturer || null,
-      model: this.extraData.model || null,
-      sdkVersion,
-      deviceName: this.deviceName,
-      clientName: this.clientName
-    })
-  }
-
   static async getOldDeviceByDeviceId(deviceId) {
     const device = await this.findOne({
       where: {
@@ -145,6 +118,60 @@ class Device extends Model {
     })
     Device.belongsTo(user)
   }
+
+  toOldJSON() {
+    let browserVersion = null
+    let sdkVersion = null
+    if (this.clientName === 'Abs Android') {
+      sdkVersion = this.deviceVersion || null
+    } else {
+      browserVersion = this.deviceVersion || null
+    }
+
+    return {
+      id: this.id,
+      deviceId: this.deviceId,
+      userId: this.userId,
+      ipAddress: this.ipAddress,
+      browserName: this.extraData.browserName || null,
+      browserVersion,
+      osName: this.extraData.osName || null,
+      osVersion: this.extraData.osVersion || null,
+      clientVersion: this.clientVersion || null,
+      manufacturer: this.extraData.manufacturer || null,
+      model: this.extraData.model || null,
+      sdkVersion,
+      deviceName: this.deviceName,
+      clientName: this.clientName
+    }
+  }
+
+  getOldDevice() {
+    let browserVersion = null
+    let sdkVersion = null
+    if (this.clientName === 'Abs Android') {
+      sdkVersion = this.deviceVersion || null
+    } else {
+      browserVersion = this.deviceVersion || null
+    }
+
+    return new oldDevice({
+      id: this.id,
+      deviceId: this.deviceId,
+      userId: this.userId,
+      ipAddress: this.ipAddress,
+      browserName: this.extraData.browserName || null,
+      browserVersion,
+      osName: this.extraData.osName || null,
+      osVersion: this.extraData.osVersion || null,
+      clientVersion: this.clientVersion || null,
+      manufacturer: this.extraData.manufacturer || null,
+      model: this.extraData.model || null,
+      sdkVersion,
+      deviceName: this.deviceName,
+      clientName: this.clientName
+    })
+  }
 }
 
 module.exports = Device