Merge pull request #18 from TaleLin/fix-extenduser

fix:修复模型扩展的问题

Author: pedro

lib/core.ts

@@ -62,6 +62,7 @@ export class Lin {
     userModel = userModel || User;
     groupModel = groupModel || Group;
     authModel = authModel || Auth;
+    this.initModels(userModel, groupModel, authModel);
     this.applyManager(userModel, groupModel, authModel);
     // 4. db 同步到数据库默认为false，每次同步会很慢 todo 抽离
     await this.applyDB(synchronize);
@@ -76,6 +77,50 @@ export class Lin {
     jwt.initApp(this.app!, secret);
   }
 
+  private initModels(userModel: any, groupModel: any, authModel: any) {
+    userModel.init(
+      {
+        ...UserInterface.attributes
+      },
+      merge(
+        {
+          sequelize: db,
+          tableName: 'lin_user',
+          modelName: 'user'
+        },
+        UserInterface.options
+      )
+    );
+
+    groupModel.init(
+      {
+        ...GroupInterface.attributes
+      },
+      merge(
+        {
+          sequelize: db,
+          tableName: 'lin_group',
+          modelName: 'group'
+        },
+        GroupInterface.options
+      )
+    );
+
+    authModel.init(
+      {
+        ...AuthInterface.attributes
+      },
+      merge(
+        {
+          sequelize: db,
+          tableName: 'lin_auth',
+          modelName: 'auth'
+        },
+        AuthInterface.options
+      )
+    );
+  }
+
   private async applyDB(synchronize?: boolean, force?: boolean) {
     synchronize && db.sync({ force });
   }
@@ -278,20 +323,6 @@ export class User extends Model {
   }
 }
 
-User.init(
-  {
-    ...UserInterface.attributes
-  },
-  merge(
-    {
-      sequelize: db,
-      tableName: 'lin_user',
-      modelName: 'user'
-    },
-    UserInterface.options
-  )
-);
-
 /**
  * 权限系统中的Group模型
  */
@@ -312,20 +343,6 @@ export class Group extends Model {
   }
 }
 
-Group.init(
-  {
-    ...GroupInterface.attributes
-  },
-  merge(
-    {
-      sequelize: db,
-      tableName: 'lin_group',
-      modelName: 'group'
-    },
-    GroupInterface.options
-  )
-);
-
 /**
  * 权限系统中的Auth模型
  */
@@ -346,20 +363,6 @@ export class Auth extends Model {
   }
 }
 
-Auth.init(
-  {
-    ...AuthInterface.attributes
-  },
-  merge(
-    {
-      sequelize: db,
-      tableName: 'lin_auth',
-      modelName: 'auth'
-    },
-    AuthInterface.options
-  )
-);
-
 export interface LogArgs {
   message?: string;
   user_id?: number;

lib/factory.ts

@@ -9,36 +9,36 @@
  *
  * ```js
  * const { modelExtend } = require("lin-mizar/lin/factory");
- * const { User } = require("lin-mizar");
+ * const { UserInterface } = require("lin-mizar");
  * const Sequelize = require("sequelize");
  *
- * const User2 = modelExtend(User, {
+ * modelExtend(UserInterface, {
  * phone: {
  *  type: Sequelize.STRING(30),
  *  unique: true,
  *  allowNull: true
  *  }
  * });
  *
- * User2.prototype.sayHello = function () {
- *  console.log("hello world!");
- * };
- *
- * module.exports = { User2 };
  * ```
  */
+// export function modelExtend(superModel: any, attributes) {
+//   superModel.tableAttributes = {
+//     ...superModel.tableAttributes,
+//     ...attributes
+//   };
+//   const model = class extends superModel {};
+//   Object.keys(attributes).forEach(key => {
+//     Object.defineProperty(model.prototype, key, {
+//       get() {
+//         return this.dataValues && this.dataValues[key];
+//       }
+//     });
+//   });
+//   return model;
+// }
+
 export function modelExtend(superModel: any, attributes) {
-  superModel.tableAttributes = {
-    ...superModel.tableAttributes,
-    ...attributes
-  };
-  const model = class extends superModel {};
-  Object.keys(attributes).forEach(key => {
-    Object.defineProperty(model.prototype, key, {
-      get() {
-        return this.dataValues && this.dataValues[key];
-      }
-    });
-  });
-  return model;
+  // UserInterface.attributes
+  superModel.attributes = { ...superModel.attributes, ...attributes };
 }

lib/interface.ts

@@ -7,7 +7,7 @@ import { generate } from './password-hash';
 /**
  * 记录信息的mixin
  */
-export const InfoCrudMixin = {
+export let InfoCrudMixin = {
   attributes: {},
   options: {
     createdAt: 'create_time',
@@ -30,7 +30,7 @@ export const InfoCrudMixin = {
 /**
  * 用户接口
  */
-export const UserInterface = {
+export let UserInterface = {
   attributes: {
     id: {
       type: Sequelize.INTEGER,
@@ -78,28 +78,37 @@ export const UserInterface = {
       }
     }
   },
-  options: merge(
-    {
-      tableName: 'lin_user',
-      getterMethods: {
-        isAdmin() {
-          // @ts-ignore
-          return this.getDataValue('admin') === UserAdmin.ADMIN;
-        },
-        isActive() {
-          // @ts-ignore
-          return this.getDataValue('active') === UserActive.ACTIVE;
-        }
+  options: {
+    tableName: 'lin_user',
+    createdAt: 'create_time',
+    updatedAt: 'update_time',
+    deletedAt: 'delete_time',
+    paranoid: true,
+    getterMethods: {
+      isAdmin() {
+        // @ts-ignore
+        return this.getDataValue('admin') === UserAdmin.ADMIN;
+      },
+      isActive() {
+        // @ts-ignore
+        return this.getDataValue('active') === UserActive.ACTIVE;
+      },
+      createTime() {
+        // @ts-ignore
+        return dayjs(this.getDataValue('create_time')).unix() * 1000;
+      },
+      updateTime() {
+        // @ts-ignore
+        return dayjs(this.getDataValue('update_time')).unix() * 1000;
       }
-    },
-    InfoCrudMixin.options
-  )
+    }
+  }
 };
 
 /**
  * 权限接口
  */
-export const AuthInterface = {
+export let AuthInterface = {
   attributes: {
     id: {
       type: Sequelize.INTEGER,
@@ -127,7 +136,7 @@ export const AuthInterface = {
 /**
  * 分组接口
  */
-export const GroupInterface = {
+export let GroupInterface = {
   attributes: {
     id: {
       type: Sequelize.INTEGER,
@@ -152,7 +161,7 @@ export const GroupInterface = {
 /**
  * 日志接口
  */
-export const LogInterface = {
+export let LogInterface = {
   attributes: {
     id: {
       type: Sequelize.INTEGER,
@@ -198,7 +207,7 @@ export const LogInterface = {
 /**
  * 文件接口
  */
-export const FileInterface = {
+export let FileInterface = {
   id: {
     type: Sequelize.INTEGER,
     primaryKey: true,