@abtnode/models 1.16.8-next-d1e52353 → 1.16.8-next-f9099675

package/lib/models/audit-log.js

@@ -13,6 +13,7 @@ function createAuditLogModel() {
                     sequelize,
                     modelName: 'AuditLog',
                     tableName: 'audit_logs',
+                    indexes: [{ fields: ['scope', 'category', 'id'] }, { fields: ['scope', 'actor', 'id'] }],
                     timestamps: true,
                 });
             }

package/lib/models/backup.js

@@ -13,6 +13,7 @@ function createBackupModel() {
                     sequelize,
                     modelName: 'Backup',
                     tableName: 'backups',
+                    indexes: [{ fields: ['appPid', 'id'] }],
                     timestamps: true,
                 });
             }

package/lib/models/connected-account.js

@@ -12,6 +12,7 @@ function createConnectedAccountModel() {
                     sequelize,
                     modelName: 'ConnectedAccount',
                     tableName: 'connected_accounts',
+                    indexes: [{ fields: ['userDid', 'did'] }],
                     timestamps: false,
                 });
             }

package/lib/models/index.js

@@ -62,7 +62,7 @@ __exportStar(require("./connection"), exports);
 __exportStar(require("./backup"), exports);
 const instances = new Map();
 function createSequelize(dbPath, config = {
-    logging: !!process.env.SEQUELIZE_LOGGING || ['production', 'test'].includes(process.env.NODE_ENV) === false,
+    logging: !!process.env.DEBUG || ['production', 'test'].includes(process.env.NODE_ENV) === false,
 }) {
     if (instances.has(dbPath)) {
         return instances.get(dbPath);

package/lib/models/passport.js

@@ -12,6 +12,7 @@ function createPassportModel() {
                     sequelize,
                     modelName: 'Passport',
                     tableName: 'passports',
+                    indexes: [{ fields: ['name', 'status', 'userDid'] }],
                     timestamps: false,
                 });
             }

package/lib/models/session.js

@@ -12,7 +12,7 @@ function createSessionModel() {
                     ...this.GENESIS_ATTRIBUTES,
                 }, {
                     sequelize,
-                    indexes: [{ fields: ['type', 'id'] }],
+                    indexes: [{ fields: ['type', 'id'] }, { fields: ['key', 'id'] }],
                     modelName: 'Session',
                     tableName: 'sessions',
                     timestamps: true,

package/lib/models/user.d.ts

@@ -1,6 +1,4 @@
 import { TUserInfo } from '@abtnode/types';
 import { DynamicModel } from '../types';
-export type UserState = Omit<TUserInfo, 'passports' | 'connectedAccounts'> & {
-    extra: Record<string, any>;
-};
+export type UserState = Omit<TUserInfo, 'passports' | 'connectedAccounts' | 'source' | 'extraConfigs'>;
 export declare function createUserModel(): DynamicModel<UserState>;

package/lib/models/user.js

@@ -13,7 +13,7 @@ function createUserModel() {
                     modelName: 'User',
                     tableName: 'users',
                     timestamps: true,
-                    indexes: [{ fields: ['email'] }, { fields: ['fullName'] }],
+                    indexes: [{ fields: ['approved', 'did'] }, { fields: ['email', 'did'] }, { fields: ['fullName', 'did'] }],
                 });
             }
             static associate(models) {
@@ -68,13 +68,8 @@ function createUserModel() {
                 index: true,
                 defaultValue: true,
             },
-            // server extended
-            extra: {
-                type: sequelize_1.DataTypes.JSON,
-                defaultValue: {},
-            },
             // app extended
-            meta: {
+            extra: {
                 type: sequelize_1.DataTypes.JSON,
                 defaultValue: {},
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.8-next-d1e52353",
+  "version": "1.16.8-next-f9099675",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/types": "1.16.8-next-d1e52353",
+    "@abtnode/types": "1.16.8-next-f9099675",
     "@nedb/core": "^2.1.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -54,5 +54,5 @@
     "typescript": "^4.8.4"
   },
   "resolutions": {},
-  "gitHead": "d357376aa3df9ef789befc7f548629deecb04d96"
+  "gitHead": "02702513382f0b2297eff3520fc77f630eec578f"
 }