@questwork/q-utilities 0.1.15 → 0.1.16

package/dist/index.min.cjs

@@ -84,20 +84,21 @@ __webpack_require__.d(__webpack_exports__, {
   sanitizeText: () => (/* reexport */ sanitizeText),
   stringFormatter: () => (/* reexport */ stringFormatter),
   stringHelper: () => (/* reexport */ stringHelper),
+  tenantPlugin: () => (/* reexport */ tenantPlugin),
   trackingPlugin: () => (/* reexport */ trackingPlugin)
 });
 
 ;// ./lib/helpers/authorize/authorize.js
-function authorize({ allowOwner, query = {}, required, user }) {
+function authorize({ allowCoordinator, allowOwner, query = {}, required, user }) {
   if (!user) {
     throw new Error('Require login.')
   }
   if (!user.permission) {
-    throw new Error('You do not have any permission.')
+    // throw new Error('You do not have any permission.')
   }
-  const scopes = user.permission.getScopes(required || {})
+  const scopes = user.permission.getScopes(required || {}) || []
   if (!scopes || scopes.length === 0) {
-    throw new Error('You are not allowed in this scope.')
+    // throw new Error('You are not allowed in this scope.')
   }
   if (!scopes.includes('*')) {
     query.tenantCode = user.tenantCode
@@ -105,8 +106,21 @@ function authorize({ allowOwner, query = {}, required, user }) {
   if (!scopes.includes('TENANT')) {
     query.eventShortCode = user.eventShortCode
   }
-  if (!scopes.includes('EVENT')) {
-    query.eventRegistrationCode = user.eventRegistrationCode
+  // if (!scopes.includes('EVENT')) {
+  //   query.eventRegistrationCode = user.eventRegistrationCode
+  // }
+  if (allowCoordinator) {
+    if (query.registrationGroupCode && user.myManagedRegistrationGroupCodes.includes(query.registrationGroupCode)) {
+      query.__ALLOW_COORDINATOR = true
+    } else {
+        if (!scopes.includes('EVENT')) {
+          query.eventRegistrationCode = user.eventRegistrationCode
+        }
+    }
+  } else {
+      if (!scopes.includes('EVENT')) {
+        query.eventRegistrationCode = user.eventRegistrationCode
+      }
   }
   if (allowOwner) {
     query.__ALLOW_OWNER = true
@@ -1486,7 +1500,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
   if (!string) {
     return ''
   }
-  let _getValueByKeys = typeof getValueByKeys !== 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
+  let _getValueByKeys = typeof getValueByKeys === 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
   const reg = new RegExp(patternMatch, 'g')
   return string.replace(reg, (match, key) => {
     const result = _getValueByKeys({ keys: key.split('.'), obj: value })
@@ -1507,7 +1521,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
 
 ;// ./lib/helpers/escapeRegex/escapeRegex.js
 function escapeRegex(string) {
-  return string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
+  return String(string).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
 }
 
 ;// ./lib/helpers/escapeRegex/index.js
@@ -1943,19 +1957,19 @@ class Repo {
       })
   }
 
-  saveAll({ docs, systemLog }) {
+  saveAll({ config = {}, docs, systemLog }) {
     let isNew
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveAll`,
-      input: [{ docs: [...docs], systemLog: { ...systemLog } }]
+      input: [{ config, docs: [...docs], systemLog: { ...systemLog } }]
     })
     const promise = typeof this.model.saveAll === 'function'
-      ? this.model.saveAll({ docs })
+      ? this.model.saveAll({ config, docs })
       : Promise.all(docs.map(async (doc) => {
         if (doc) {
-          const result = await this.saveOne({ doc })
+          const result = await this.saveOne({ config, doc })
           isNew = result.isNew
           const _data = result._data || result.data
           return _data[0]
@@ -1977,15 +1991,19 @@ class Repo {
     })
   }
 
-  saveOne({ doc, systemLog }) {
+  saveOne({ config = {}, doc, systemLog }) {
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveOne`,
-      input: [{ doc: { ...doc }, systemLog: { ...systemLog } }]
+      input: [{ config, doc: { ...doc }, systemLog: { ...systemLog } }]
     })
+    const saveOptions = {
+      ...this.saveOptions,
+      ...config,
+    }
     return new Promise((resolve, reject) => {
-      this.model.saveOne(doc, this.saveOptions, (err, result) => {
+      this.model.saveOne(doc, saveOptions, (err, result) => {
         if (err) {
           log({ level: 'warn', output: err.toString() })
           reject(err)
@@ -2127,11 +2145,11 @@ class Service {
     return this.initFromArray(arr).filter((i) => i)
   }
 
-  async saveAll({ docs = [], config = {}, systemLog } = {}) {
+  async saveAll({ config = {}, docs = [], systemLog } = {}) {
     const copies = docs.map((doc) => {
       return config.skipInit ? doc : this.init(doc)
     })
-    const result = await this.repo.saveAll({ docs: copies, systemLog })
+    const result = await this.repo.saveAll({ config, docs: copies, systemLog })
     return makeApiResponse({
       repo: this.repo,
       result
@@ -2139,10 +2157,10 @@ class Service {
   }
 
   // set skipInit to true if we want to use POST for query
-  async saveOne({ doc = {}, config = {}, systemLog } = {}) {
+  async saveOne({ config = {}, doc = {}, systemLog } = {}) {
     const copy = config.skipInit ? doc : this.init(doc)
     if (copy) {
-      const result = await this.repo.saveOne({ doc: copy, systemLog })
+      const result = await this.repo.saveOne({ config, doc: copy, systemLog })
       return makeApiResponse({
         repo: this.repo,
         result
@@ -2612,6 +2630,19 @@ function trackingPlugin(schema, options) {
     next()
   })
 
+  // Add core indexes
+  schema.index({
+    'meta.active': 1,
+    'meta.deleted': 1
+  }, {
+    name: 'tracking_status_index',
+    background: true,
+    partialFilterExpression: { 
+      'meta.active': true,
+      'meta.deleted': false 
+    }
+  })
+
   // Optional: Add helper methods
   // schema.methods.touch = function(userId) {
   //   this.meta.updatedAt = new Date()
@@ -2619,6 +2650,57 @@ function trackingPlugin(schema, options) {
   // }
 }
 
+;// ./lib/helpers/tenantPlugin/tenantPlugin.js
+
+
+function tenantPlugin(schema, options) {
+  // Apply tracking plugin first if not already present
+  if (!schema.path('meta')) {
+    trackingPlugin(schema, options)
+  }
+
+  // Add tenant-specific fields
+  schema.add({
+    metadata: [{ type: Object }], // Instead of Schema.Types.Mixed
+    remarks: [{ type: Object }],
+    tenantCode: { type: String, required: true }
+  })
+
+  // Add core indexes
+  schema.index({
+    'tenantCode': 1
+  }, {
+    name: 'tenant_core_index',
+    background: true
+  })
+
+  // 1. ENHANCE EXISTING TRACKING INDEXES
+  const existingIndexes = schema.indexes()
+  
+  // Check if tracking_status_index exists
+  const hasTenantStatusIndex = existingIndexes.some(idx => 
+    idx.name === 'tenant_status_index' // Check by name for reliability
+  )
+
+  if (!hasTenantStatusIndex) {
+    schema.index({
+      'tenantCode': 1, // Unique field first
+      _type: 1, // Low-cardinality field last
+    }, {
+      name: 'tenant_status_index',
+      background: true,
+      partialFilterExpression: {
+        '_type': 'Tenant',
+        'meta.active': true,
+        'meta.deleted': false 
+      }
+    })
+  }
+}
+
+;// ./lib/helpers/tenantPlugin/index.js
+
+
 ;// ./lib/helpers/trackingPlugin/index.js
 
 
@@ -2645,6 +2727,7 @@ function trackingPlugin(schema, options) {
 
 
 
+
 
 
 ;// ./lib/models/apiResponse/index.js
@@ -2986,7 +3069,10 @@ class KeyValueObject {
     }, [])
   }
   static sameKey(item, key) {
-    return _isSame(item.key, key)
+    if (item) {
+      return _isSame(item.key, key)
+    }
+    return false
   }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
@@ -3240,17 +3326,19 @@ class TrackedEntity {
   constructor(options = {}) {
     options = options || {}
     const timestamp = Date.now()
-    const _tracking = {
-      active: options.active ?? true,
-      created: options.created ?? timestamp,
-      creator: options.creator ?? '',
-      deleted: options.deleted ?? false,
-      modified: options.modified ?? timestamp,
-      owner: options.owner ?? '',
+    this.meta = {
+      active: options.meta?.active ?? options.active ?? true,
+      created: options.meta?.created ?? (options.created 
+      ? new Date(options.created).getTime() 
+      : timestamp),
+      creator: options.meta?.creator ?? options.creator ?? '',
+      deleted: options.meta?.deleted ?? options.deleted ?? false,
+      modified: options.meta?.modified ?? (options.modified 
+      ? new Date(options.modified).getTime() 
+      : timestamp),
+      owner: options.meta?.owner ?? options.owner ?? '',
     }
 
-    this.meta = { ..._tracking, ...options.meta }
-
     // if (trackFlat) {
     //   Object.assign(this, _tracking)
     // } else {

package/dist/q-utilities.esm.js

@@ -1,15 +1,15 @@
 
 ;// ./lib/helpers/authorize/authorize.js
-function authorize({ allowOwner, query = {}, required, user }) {
+function authorize({ allowCoordinator, allowOwner, query = {}, required, user }) {
   if (!user) {
     throw new Error('Require login.')
   }
   if (!user.permission) {
-    throw new Error('You do not have any permission.')
+    // throw new Error('You do not have any permission.')
   }
-  const scopes = user.permission.getScopes(required || {})
+  const scopes = user.permission.getScopes(required || {}) || []
   if (!scopes || scopes.length === 0) {
-    throw new Error('You are not allowed in this scope.')
+    // throw new Error('You are not allowed in this scope.')
   }
   if (!scopes.includes('*')) {
     query.tenantCode = user.tenantCode
@@ -17,8 +17,21 @@ function authorize({ allowOwner, query = {}, required, user }) {
   if (!scopes.includes('TENANT')) {
     query.eventShortCode = user.eventShortCode
   }
-  if (!scopes.includes('EVENT')) {
-    query.eventRegistrationCode = user.eventRegistrationCode
+  // if (!scopes.includes('EVENT')) {
+  //   query.eventRegistrationCode = user.eventRegistrationCode
+  // }
+  if (allowCoordinator) {
+    if (query.registrationGroupCode && user.myManagedRegistrationGroupCodes.includes(query.registrationGroupCode)) {
+      query.__ALLOW_COORDINATOR = true
+    } else {
+        if (!scopes.includes('EVENT')) {
+          query.eventRegistrationCode = user.eventRegistrationCode
+        }
+    }
+  } else {
+      if (!scopes.includes('EVENT')) {
+        query.eventRegistrationCode = user.eventRegistrationCode
+      }
   }
   if (allowOwner) {
     query.__ALLOW_OWNER = true
@@ -1398,7 +1411,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
   if (!string) {
     return ''
   }
-  let _getValueByKeys = typeof getValueByKeys !== 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
+  let _getValueByKeys = typeof getValueByKeys === 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
   const reg = new RegExp(patternMatch, 'g')
   return string.replace(reg, (match, key) => {
     const result = _getValueByKeys({ keys: key.split('.'), obj: value })
@@ -1419,7 +1432,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
 
 ;// ./lib/helpers/escapeRegex/escapeRegex.js
 function escapeRegex(string) {
-  return string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
+  return String(string).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
 }
 
 ;// ./lib/helpers/escapeRegex/index.js
@@ -1855,19 +1868,19 @@ class Repo {
       })
   }
 
-  saveAll({ docs, systemLog }) {
+  saveAll({ config = {}, docs, systemLog }) {
     let isNew
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveAll`,
-      input: [{ docs: [...docs], systemLog: { ...systemLog } }]
+      input: [{ config, docs: [...docs], systemLog: { ...systemLog } }]
     })
     const promise = typeof this.model.saveAll === 'function'
-      ? this.model.saveAll({ docs })
+      ? this.model.saveAll({ config, docs })
       : Promise.all(docs.map(async (doc) => {
         if (doc) {
-          const result = await this.saveOne({ doc })
+          const result = await this.saveOne({ config, doc })
           isNew = result.isNew
           const _data = result._data || result.data
           return _data[0]
@@ -1889,15 +1902,19 @@ class Repo {
     })
   }
 
-  saveOne({ doc, systemLog }) {
+  saveOne({ config = {}, doc, systemLog }) {
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveOne`,
-      input: [{ doc: { ...doc }, systemLog: { ...systemLog } }]
+      input: [{ config, doc: { ...doc }, systemLog: { ...systemLog } }]
     })
+    const saveOptions = {
+      ...this.saveOptions,
+      ...config,
+    }
     return new Promise((resolve, reject) => {
-      this.model.saveOne(doc, this.saveOptions, (err, result) => {
+      this.model.saveOne(doc, saveOptions, (err, result) => {
         if (err) {
           log({ level: 'warn', output: err.toString() })
           reject(err)
@@ -2039,11 +2056,11 @@ class Service {
     return this.initFromArray(arr).filter((i) => i)
   }
 
-  async saveAll({ docs = [], config = {}, systemLog } = {}) {
+  async saveAll({ config = {}, docs = [], systemLog } = {}) {
     const copies = docs.map((doc) => {
       return config.skipInit ? doc : this.init(doc)
     })
-    const result = await this.repo.saveAll({ docs: copies, systemLog })
+    const result = await this.repo.saveAll({ config, docs: copies, systemLog })
     return makeApiResponse({
       repo: this.repo,
       result
@@ -2051,10 +2068,10 @@ class Service {
   }
 
   // set skipInit to true if we want to use POST for query
-  async saveOne({ doc = {}, config = {}, systemLog } = {}) {
+  async saveOne({ config = {}, doc = {}, systemLog } = {}) {
     const copy = config.skipInit ? doc : this.init(doc)
     if (copy) {
-      const result = await this.repo.saveOne({ doc: copy, systemLog })
+      const result = await this.repo.saveOne({ config, doc: copy, systemLog })
       return makeApiResponse({
         repo: this.repo,
         result
@@ -2524,6 +2541,19 @@ function trackingPlugin(schema, options) {
     next()
   })
 
+  // Add core indexes
+  schema.index({
+    'meta.active': 1,
+    'meta.deleted': 1
+  }, {
+    name: 'tracking_status_index',
+    background: true,
+    partialFilterExpression: { 
+      'meta.active': true,
+      'meta.deleted': false 
+    }
+  })
+
   // Optional: Add helper methods
   // schema.methods.touch = function(userId) {
   //   this.meta.updatedAt = new Date()
@@ -2531,6 +2561,57 @@ function trackingPlugin(schema, options) {
   // }
 }
 
+;// ./lib/helpers/tenantPlugin/tenantPlugin.js
+
+
+function tenantPlugin(schema, options) {
+  // Apply tracking plugin first if not already present
+  if (!schema.path('meta')) {
+    trackingPlugin(schema, options)
+  }
+
+  // Add tenant-specific fields
+  schema.add({
+    metadata: [{ type: Object }], // Instead of Schema.Types.Mixed
+    remarks: [{ type: Object }],
+    tenantCode: { type: String, required: true }
+  })
+
+  // Add core indexes
+  schema.index({
+    'tenantCode': 1
+  }, {
+    name: 'tenant_core_index',
+    background: true
+  })
+
+  // 1. ENHANCE EXISTING TRACKING INDEXES
+  const existingIndexes = schema.indexes()
+  
+  // Check if tracking_status_index exists
+  const hasTenantStatusIndex = existingIndexes.some(idx => 
+    idx.name === 'tenant_status_index' // Check by name for reliability
+  )
+
+  if (!hasTenantStatusIndex) {
+    schema.index({
+      'tenantCode': 1, // Unique field first
+      _type: 1, // Low-cardinality field last
+    }, {
+      name: 'tenant_status_index',
+      background: true,
+      partialFilterExpression: {
+        '_type': 'Tenant',
+        'meta.active': true,
+        'meta.deleted': false 
+      }
+    })
+  }
+}
+
+;// ./lib/helpers/tenantPlugin/index.js
+
+
 ;// ./lib/helpers/trackingPlugin/index.js
 
 
@@ -2557,6 +2638,7 @@ function trackingPlugin(schema, options) {
 
 
 
+
 
 
 ;// ./lib/models/apiResponse/index.js
@@ -2898,7 +2980,10 @@ class KeyValueObject {
     }, [])
   }
   static sameKey(item, key) {
-    return _isSame(item.key, key)
+    if (item) {
+      return _isSame(item.key, key)
+    }
+    return false
   }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
@@ -3152,17 +3237,19 @@ class TrackedEntity {
   constructor(options = {}) {
     options = options || {}
     const timestamp = Date.now()
-    const _tracking = {
-      active: options.active ?? true,
-      created: options.created ?? timestamp,
-      creator: options.creator ?? '',
-      deleted: options.deleted ?? false,
-      modified: options.modified ?? timestamp,
-      owner: options.owner ?? '',
+    this.meta = {
+      active: options.meta?.active ?? options.active ?? true,
+      created: options.meta?.created ?? (options.created 
+      ? new Date(options.created).getTime() 
+      : timestamp),
+      creator: options.meta?.creator ?? options.creator ?? '',
+      deleted: options.meta?.deleted ?? options.deleted ?? false,
+      modified: options.meta?.modified ?? (options.modified 
+      ? new Date(options.modified).getTime() 
+      : timestamp),
+      owner: options.meta?.owner ?? options.owner ?? '',
     }
 
-    this.meta = { ..._tracking, ...options.meta }
-
     // if (trackFlat) {
     //   Object.assign(this, _tracking)
     // } else {
@@ -3431,4 +3518,4 @@ function _makeSetCode(fieldName, options) {
 ;// ./index.js
 
 
-export { ApiResponse, AwsStsS3Client, KeyValueObject, Metadata, QMeta, Repo, Service, TemplateCompiler, TenantAwareEntity, TrackedEntity, UniqueKeyGenerator, authorize, changeCreatorOwner, concatStringByArray, convertString, escapeRegex, expressHelper, extractEmails, formatDate, generalPost, getValidation, getValueByKeys_getValueByKeys as getValueByKeys, init, initFromArray, initOnlyValidFromArray, makeApiResponse, makeService, mergeArraysByKey, objectHelper, pReduce, padZeros, replacePlaceholders, sanitizeText, stringFormatter, stringHelper, trackingPlugin };
+export { ApiResponse, AwsStsS3Client, KeyValueObject, Metadata, QMeta, Repo, Service, TemplateCompiler, TenantAwareEntity, TrackedEntity, UniqueKeyGenerator, authorize, changeCreatorOwner, concatStringByArray, convertString, escapeRegex, expressHelper, extractEmails, formatDate, generalPost, getValidation, getValueByKeys_getValueByKeys as getValueByKeys, init, initFromArray, initOnlyValidFromArray, makeApiResponse, makeService, mergeArraysByKey, objectHelper, pReduce, padZeros, replacePlaceholders, sanitizeText, stringFormatter, stringHelper, tenantPlugin, trackingPlugin };

package/dist/q-utilities.min.js

@@ -83,20 +83,21 @@ __webpack_require__.d(__webpack_exports__, {
   sanitizeText: () => (/* reexport */ sanitizeText),
   stringFormatter: () => (/* reexport */ stringFormatter),
   stringHelper: () => (/* reexport */ stringHelper),
+  tenantPlugin: () => (/* reexport */ tenantPlugin),
   trackingPlugin: () => (/* reexport */ trackingPlugin)
 });
 
 ;// ./lib/helpers/authorize/authorize.js
-function authorize({ allowOwner, query = {}, required, user }) {
+function authorize({ allowCoordinator, allowOwner, query = {}, required, user }) {
   if (!user) {
     throw new Error('Require login.')
   }
   if (!user.permission) {
-    throw new Error('You do not have any permission.')
+    // throw new Error('You do not have any permission.')
   }
-  const scopes = user.permission.getScopes(required || {})
+  const scopes = user.permission.getScopes(required || {}) || []
   if (!scopes || scopes.length === 0) {
-    throw new Error('You are not allowed in this scope.')
+    // throw new Error('You are not allowed in this scope.')
   }
   if (!scopes.includes('*')) {
     query.tenantCode = user.tenantCode
@@ -104,8 +105,21 @@ function authorize({ allowOwner, query = {}, required, user }) {
   if (!scopes.includes('TENANT')) {
     query.eventShortCode = user.eventShortCode
   }
-  if (!scopes.includes('EVENT')) {
-    query.eventRegistrationCode = user.eventRegistrationCode
+  // if (!scopes.includes('EVENT')) {
+  //   query.eventRegistrationCode = user.eventRegistrationCode
+  // }
+  if (allowCoordinator) {
+    if (query.registrationGroupCode && user.myManagedRegistrationGroupCodes.includes(query.registrationGroupCode)) {
+      query.__ALLOW_COORDINATOR = true
+    } else {
+        if (!scopes.includes('EVENT')) {
+          query.eventRegistrationCode = user.eventRegistrationCode
+        }
+    }
+  } else {
+      if (!scopes.includes('EVENT')) {
+        query.eventRegistrationCode = user.eventRegistrationCode
+      }
   }
   if (allowOwner) {
     query.__ALLOW_OWNER = true
@@ -1485,7 +1499,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
   if (!string) {
     return ''
   }
-  let _getValueByKeys = typeof getValueByKeys !== 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
+  let _getValueByKeys = typeof getValueByKeys === 'function' ? getValueByKeys : getValueByKeys_getValueByKeys
   const reg = new RegExp(patternMatch, 'g')
   return string.replace(reg, (match, key) => {
     const result = _getValueByKeys({ keys: key.split('.'), obj: value })
@@ -1506,7 +1520,7 @@ function convertString(string, patternMatch = /\$\{(.+?)\}/g, value, getValueByK
 
 ;// ./lib/helpers/escapeRegex/escapeRegex.js
 function escapeRegex(string) {
-  return string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
+  return String(string).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')
 }
 
 ;// ./lib/helpers/escapeRegex/index.js
@@ -1942,19 +1956,19 @@ class Repo {
       })
   }
 
-  saveAll({ docs, systemLog }) {
+  saveAll({ config = {}, docs, systemLog }) {
     let isNew
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveAll`,
-      input: [{ docs: [...docs], systemLog: { ...systemLog } }]
+      input: [{ config, docs: [...docs], systemLog: { ...systemLog } }]
     })
     const promise = typeof this.model.saveAll === 'function'
-      ? this.model.saveAll({ docs })
+      ? this.model.saveAll({ config, docs })
       : Promise.all(docs.map(async (doc) => {
         if (doc) {
-          const result = await this.saveOne({ doc })
+          const result = await this.saveOne({ config, doc })
           isNew = result.isNew
           const _data = result._data || result.data
           return _data[0]
@@ -1976,15 +1990,19 @@ class Repo {
     })
   }
 
-  saveOne({ doc, systemLog }) {
+  saveOne({ config = {}, doc, systemLog }) {
     const log = _makeLog({
       systemLog,
       label: 'REPO_WRITE',
       message: `fn ${this._classname}.prototype.saveOne`,
-      input: [{ doc: { ...doc }, systemLog: { ...systemLog } }]
+      input: [{ config, doc: { ...doc }, systemLog: { ...systemLog } }]
     })
+    const saveOptions = {
+      ...this.saveOptions,
+      ...config,
+    }
     return new Promise((resolve, reject) => {
-      this.model.saveOne(doc, this.saveOptions, (err, result) => {
+      this.model.saveOne(doc, saveOptions, (err, result) => {
         if (err) {
           log({ level: 'warn', output: err.toString() })
           reject(err)
@@ -2126,11 +2144,11 @@ class Service {
     return this.initFromArray(arr).filter((i) => i)
   }
 
-  async saveAll({ docs = [], config = {}, systemLog } = {}) {
+  async saveAll({ config = {}, docs = [], systemLog } = {}) {
     const copies = docs.map((doc) => {
       return config.skipInit ? doc : this.init(doc)
     })
-    const result = await this.repo.saveAll({ docs: copies, systemLog })
+    const result = await this.repo.saveAll({ config, docs: copies, systemLog })
     return makeApiResponse({
       repo: this.repo,
       result
@@ -2138,10 +2156,10 @@ class Service {
   }
 
   // set skipInit to true if we want to use POST for query
-  async saveOne({ doc = {}, config = {}, systemLog } = {}) {
+  async saveOne({ config = {}, doc = {}, systemLog } = {}) {
     const copy = config.skipInit ? doc : this.init(doc)
     if (copy) {
-      const result = await this.repo.saveOne({ doc: copy, systemLog })
+      const result = await this.repo.saveOne({ config, doc: copy, systemLog })
       return makeApiResponse({
         repo: this.repo,
         result
@@ -2611,6 +2629,19 @@ function trackingPlugin(schema, options) {
     next()
   })
 
+  // Add core indexes
+  schema.index({
+    'meta.active': 1,
+    'meta.deleted': 1
+  }, {
+    name: 'tracking_status_index',
+    background: true,
+    partialFilterExpression: { 
+      'meta.active': true,
+      'meta.deleted': false 
+    }
+  })
+
   // Optional: Add helper methods
   // schema.methods.touch = function(userId) {
   //   this.meta.updatedAt = new Date()
@@ -2618,6 +2649,57 @@ function trackingPlugin(schema, options) {
   // }
 }
 
+;// ./lib/helpers/tenantPlugin/tenantPlugin.js
+
+
+function tenantPlugin(schema, options) {
+  // Apply tracking plugin first if not already present
+  if (!schema.path('meta')) {
+    trackingPlugin(schema, options)
+  }
+
+  // Add tenant-specific fields
+  schema.add({
+    metadata: [{ type: Object }], // Instead of Schema.Types.Mixed
+    remarks: [{ type: Object }],
+    tenantCode: { type: String, required: true }
+  })
+
+  // Add core indexes
+  schema.index({
+    'tenantCode': 1
+  }, {
+    name: 'tenant_core_index',
+    background: true
+  })
+
+  // 1. ENHANCE EXISTING TRACKING INDEXES
+  const existingIndexes = schema.indexes()
+  
+  // Check if tracking_status_index exists
+  const hasTenantStatusIndex = existingIndexes.some(idx => 
+    idx.name === 'tenant_status_index' // Check by name for reliability
+  )
+
+  if (!hasTenantStatusIndex) {
+    schema.index({
+      'tenantCode': 1, // Unique field first
+      _type: 1, // Low-cardinality field last
+    }, {
+      name: 'tenant_status_index',
+      background: true,
+      partialFilterExpression: {
+        '_type': 'Tenant',
+        'meta.active': true,
+        'meta.deleted': false 
+      }
+    })
+  }
+}
+
+;// ./lib/helpers/tenantPlugin/index.js
+
+
 ;// ./lib/helpers/trackingPlugin/index.js
 
 
@@ -2644,6 +2726,7 @@ function trackingPlugin(schema, options) {
 
 
 
+
 
 
 ;// ./lib/models/apiResponse/index.js
@@ -2985,7 +3068,10 @@ class KeyValueObject {
     }, [])
   }
   static sameKey(item, key) {
-    return _isSame(item.key, key)
+    if (item) {
+      return _isSame(item.key, key)
+    }
+    return false
   }
   static toObject(arr = []) {
     if (Array.isArray(arr)) {
@@ -3239,17 +3325,19 @@ class TrackedEntity {
   constructor(options = {}) {
     options = options || {}
     const timestamp = Date.now()
-    const _tracking = {
-      active: options.active ?? true,
-      created: options.created ?? timestamp,
-      creator: options.creator ?? '',
-      deleted: options.deleted ?? false,
-      modified: options.modified ?? timestamp,
-      owner: options.owner ?? '',
+    this.meta = {
+      active: options.meta?.active ?? options.active ?? true,
+      created: options.meta?.created ?? (options.created 
+      ? new Date(options.created).getTime() 
+      : timestamp),
+      creator: options.meta?.creator ?? options.creator ?? '',
+      deleted: options.meta?.deleted ?? options.deleted ?? false,
+      modified: options.meta?.modified ?? (options.modified 
+      ? new Date(options.modified).getTime() 
+      : timestamp),
+      owner: options.meta?.owner ?? options.owner ?? '',
     }
 
-    this.meta = { ..._tracking, ...options.meta }
-
     // if (trackFlat) {
     //   Object.assign(this, _tracking)
     // } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-utilities",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Questwork QUtilities",
   "type": "module",
   "exports": {