@kne/fastify-account 1.0.0-alpha.1 → 1.0.0-alpha.11

package/libs/models/tenant-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       status: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'applicationId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-org.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantOrg',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -22,9 +21,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantPermission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       permissionId: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'permissionId', 'deletedAt']
+          fields: ['tenant_id', 'permission_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-role-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantRoleApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       roleId: {
@@ -19,15 +18,20 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           name: 'application_key',
           unique: true,
-          fields: ['tenantId', 'applicationId', 'roleId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'role_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ tenantRoleApplication, application }) => {
+      tenantRoleApplication.belongsTo(application, {
+        targetKey: 'uuid',
+        constraints: false
+      });
     }
-  );
+  };
 };

package/libs/models/tenant-role-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantRolePermission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       permissionId: {
@@ -19,15 +18,17 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           name: 'permission_key',
           unique: true,
-          fields: ['tenantId', 'permissionId', 'roleId', 'deletedAt']
+          fields: ['tenant_id', 'permission_id', 'role_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ tenantRolePermission, permission }) => {
+      tenantRolePermission.belongsTo(permission, { constraints: false });
     }
-  );
+  };
 };

package/libs/models/tenant-role.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantRole',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -19,9 +18,6 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:用户自定义,1:系统默认
       },
       description: DataTypes.TEXT
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-share-group-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantShareGroupId: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-share-group.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-source-user-share-group.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantUserShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantUserId: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-token.js

@@ -1,7 +1,6 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantToken',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
         type: DataTypes.UUID,
         allowNull: false
@@ -15,18 +14,17 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         allowNull: false //10:邀请用户加入租户
       },
-      createTenantUserId: {
+      createdTenantUserId: {
         type: DataTypes.UUID
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'token', 'type', 'deletedAt']
+          fields: ['tenant_id', 'token', 'type', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-user-org.js

@@ -1,22 +1,23 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantUserOrg',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
+      id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+      },
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantUserId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantOrgId: {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-user-role.js

@@ -1,22 +1,23 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantUserRole',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
+      id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+      },
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantUserId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantRoleId: {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-user-share-group.js

@@ -1,22 +1,18 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantUserShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantUserId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantShareGroupId: {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-user.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  const tenantUser = sequelize.define(
-    'tenantUser',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       userId: {
         type: DataTypes.UUID,
         allowNull: false
@@ -36,21 +39,37 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:正常,11:已禁用,12:已关闭,
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'userId', 'deletedAt']
+          fields: ['uuid', 'deleted_at']
+        },
+        {
+          unique: true,
+          fields: ['tenant_id', 'user_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ user, tenantRole, tenantUser, tenantUserRole, tenantOrg, tenantUserOrg }) => {
+      tenantUser.belongsToMany(tenantRole, {
+        through: tenantUserRole,
+        foreignKey: 'tenantUserId',
+        otherKey: 'tenantRoleId',
+        sourceKey: 'uuid',
+        constraints: false
+      });
+      tenantUser.belongsToMany(tenantOrg, {
+        through: tenantUserOrg,
+        foreignKey: 'tenantUserId',
+        otherKey: 'tenantOrgId',
+        sourceKey: 'uuid',
+        constraints: false
+      });
+      tenantUser.belongsTo(user, {
+        targetKey: 'uuid',
+        constraints: false
+      });
     }
-  );
-
-  tenantUser.associate = ({ user, tenantRole, tenantUser, tenantUserRole, tenantOrg, tenantUserOrg }) => {
-    tenantUser.belongsToMany(tenantRole, { through: tenantUserRole });
-    tenantUser.belongsToMany(tenantOrg, { through: tenantUserOrg });
-    tenantUser.belongsTo(user);
   };
-  return tenantUser;
 };

package/libs/models/tenant.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenant',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       name: {
         type: DataTypes.STRING,
         allowNull: false
@@ -31,8 +34,13 @@ module.exports = (sequelize, DataTypes) => {
       },
       description: DataTypes.TEXT
     },
-    {
-      paranoid: true
+    options: {
+      indexes: [
+        {
+          unique: true,
+          fields: ['uuid', 'deleted_at']
+        }
+      ]
     }
-  );
+  };
 };

package/libs/models/user-account.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'userAccount',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       password: {
         type: DataTypes.STRING,
         allowNull: false
@@ -19,8 +22,13 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.UUID //用户修改密码时重新生成一条数据，该字段用于记录这个账号之前是属于哪个账号的
       }
     },
-    {
-      paranoid: true
+    options: {
+      indexes: [
+        {
+          unique: true,
+          fields: ['uuid', 'deleted_at']
+        }
+      ]
     }
-  );
+  };
 };

package/libs/models/user.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  const user = sequelize.define(
-    'user',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       nickname: DataTypes.STRING,
       email: DataTypes.STRING,
       phone: DataTypes.STRING,
@@ -26,25 +29,32 @@ module.exports = (sequelize, DataTypes) => {
       birthday: DataTypes.DATE,
       description: DataTypes.TEXT
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['email', 'deletedAt']
+          fields: ['uuid', 'deleted_at']
         },
         {
           unique: true,
-          fields: ['phone', 'deletedAt']
+          fields: ['email', 'deleted_at']
+        },
+        {
+          unique: true,
+          fields: ['phone', 'deleted_at']
         }
       ]
+    },
+    associate: ({ adminRole, user, tenant, tenantUser }) => {
+      user.hasOne(adminRole, { foreignKey: 'userId', sourceKey: 'uuid', constraints: false });
+      user.belongsToMany(tenant, {
+        through: { model: tenantUser, unique: false },
+        otherKey: 'tenantId',
+        foreignKey: 'userId',
+        targetKey: 'uuid',
+        sourceKey: 'uuid',
+        constraints: false
+      });
     }
-  );
-
-  user.associate = ({ adminRole, user, tenant, tenantUser }) => {
-    user.hasOne(adminRole, { foreignKey: 'userId' });
-    user.belongsToMany(tenant, { through: { model: tenantUser, unique: false } });
   };
-
-  return user;
 };

package/libs/models/verification-code.js

@@ -1,7 +1,6 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'verificationCode',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       name: {
         type: DataTypes.STRING,
         allowNull: false
@@ -18,9 +17,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0 //0:未验证,1:已验证,2:已过期
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };