sumba 2.0.0 → 2.1.0

package/extend/bajo/hook/{dobo.sumba-user@before-record-create.js → dobo.sumba-user@before-create-record.js}

@@ -1,9 +1,9 @@
 import resetToken from '../../../lib/reset-token.js'
 
-async function afterRecordCreate (body, options = {}) {
+async function beforeCreateRecord (body, options = {}) {
   const { token, salt } = await resetToken.call(this)
   body.token = token
   body.salt = salt
 }
 
-export default afterRecordCreate
+export default beforeCreateRecord

package/extend/bajo/hook/dobo.sumba-user@before-record-validation.js

@@ -1,10 +1,10 @@
 import passwordRule from '../../../lib/password-rule.js'
 
-async function doboSumbaUserBeforeRecordValidation (body, options = {}) {
-  const { set } = this.lib._
+async function beforeRecordValidation (body, options = {}) {
+  const { set } = this.app.lib._
   const password = await passwordRule.call(this, options.req)
   const rule = { password }
   set(options, 'validation.params.rule', rule)
 }
 
-export default doboSumbaUserBeforeRecordValidation
+export default beforeRecordValidation

package/extend/bajo/hook/{dobo.sumba-user@before-record-update.js → dobo.sumba-user@before-update-record.js}

@@ -1,6 +1,6 @@
 import resetToken from '../../../lib/reset-token.js'
 
-async function beforeRecordUpdate (id, body, options = {}) {
+async function beforeUpdateRecord (id, body, options = {}) {
   if (body.salt) {
     const { token, salt } = await resetToken.call(this, body.salt)
     body.token = token
@@ -8,4 +8,4 @@ async function beforeRecordUpdate (id, body, options = {}) {
   }
 }
 
-export default beforeRecordUpdate
+export default beforeUpdateRecord

package/extend/bajo/hook/dobo@before-count-record.js

@@ -0,0 +1,8 @@
+import { handler } from './dobo@before-find-record.js'
+
+const doboBeforeCountRecord = {
+  level: 1000,
+  handler
+}
+
+export default doboBeforeCountRecord

package/extend/bajo/hook/{dobo@before-record-create.js → dobo@before-create-record.js}

@@ -1,18 +1,18 @@
-const doboBeforeRecordCreate = {
+const doboBeforeCreateRecord = {
   level: 1000,
-  handler: async function (model, body, options = {}) {
-    const { get } = this.lib._
-    const { getField } = this.app.dobo
+  handler: async function (modelName, body, options = {}) {
+    const { get } = this.app.lib._
     const { req } = options
 
     if (options.noAutoFilter || !req) return
     const item = { siteId: 'site.id', userId: 'user.id' }
+    const model = this.app.dobo.getModel(modelName)
     for (const i in item) {
       const rec = get(req, item[i])
-      const field = getField(i, model)
+      const field = model.getProperty(i)
       if (rec && field) body[i] = field.type === 'string' ? (rec + '') : rec
     }
   }
 }
 
-export default doboBeforeRecordCreate
+export default doboBeforeCreateRecord

package/extend/bajo/hook/dobo@before-find-one-record.js

@@ -0,0 +1,8 @@
+import { handler } from './dobo@before-find-record.js'
+
+const doboBeforeFindOneRecord = {
+  level: 1000,
+  handler
+}
+
+export default doboBeforeFindOneRecord

package/extend/bajo/hook/{dobo@before-record-find.js → dobo@before-find-record.js}

@@ -1,12 +1,12 @@
 const useAdmin = ['waibuAdmin']
 
-export async function rebuildFilter (model, filter, req) {
-  const { isEmpty, map, find, get } = this.lib._
-  const { hasField } = this.app.dobo
+export async function rebuildFilter (modelName, filter, req) {
+  const { isEmpty, map, find, get } = this.app.lib._
   filter.query = filter.query ?? {}
-  const hasSiteId = hasField('siteId', model)
-  const hasUserId = hasField('userId', model)
-  const hasTeamId = hasField('teamId', model)
+  const model = this.app.dobo.getModel(modelName)
+  const hasSiteId = model.hasProperty('siteId')
+  const hasUserId = model.hasProperty('userId')
+  const hasTeamId = model.hasProperty('teamId')
   const isAdmin = find(get(req, 'user.teams', []), { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
   if (!(hasSiteId || hasUserId || hasTeamId)) return filter
   const q = { $and: [] }
@@ -26,15 +26,15 @@ export async function rebuildFilter (model, filter, req) {
   return filter
 }
 
-export async function handler (model, filter, options = {}) {
+export async function handler (modelName, filter, options = {}) {
   const { req } = options
   if (options.noAutoFilter || !req) return
-  filter = await rebuildFilter.call(this, model, filter, req)
+  filter = await rebuildFilter.call(this, modelName, filter, req)
 }
 
-const doboBeforeRecordFind = {
+const doboBeforeFindRecord = {
   level: 1000,
   handler
 }
 
-export default doboBeforeRecordFind
+export default doboBeforeFindRecord

package/extend/bajo/hook/dobo@before-get-record.js

@@ -0,0 +1,23 @@
+import { rebuildFilter } from './dobo@before-find-record.js'
+
+export async function checker (modelName, id, options = {}) {
+  const { req } = options
+
+  const model = this.app.dobo.getModel(modelName)
+  if (options.noAutoFilter || !req) return
+  const filter = await rebuildFilter.call(this, modelName, {}, req)
+  if (filter.query.$and) filter.query.$and.push({ id })
+  else filter.query.id = id
+  filter.limit = 1
+  const rows = await model.findRecord(filter, { count: false })
+  if (rows.length === 0) throw this.app.dobo.error('recordNotFound%s%s', id, this.name, { statusCode: 404 })
+}
+
+const doboBeforeGetRecord = {
+  level: 1000,
+  handler: async function (modelName, id, options) {
+    await checker.call(this, modelName, id, options)
+  }
+}
+
+export default doboBeforeGetRecord

package/extend/bajo/hook/dobo@before-remove-record.js

@@ -0,0 +1,10 @@
+import { checker } from './dobo@before-get-record.js'
+
+const doboBeforeRemoveRecord = {
+  level: 1000,
+  handler: async function (modelName, id, options = {}) {
+    await checker.call(this, modelName, id, options.req)
+  }
+}
+
+export default doboBeforeRemoveRecord

package/extend/bajo/hook/dobo@before-update-record.js

@@ -0,0 +1,10 @@
+import { checker } from './dobo@before-get-record.js'
+
+const doboBeforeUpdateRecord = {
+  level: 1000,
+  handler: async function (modelName, id, body, options = {}) {
+    await checker.call(this, modelName, id, options)
+  }
+}
+
+export default doboBeforeUpdateRecord

package/extend/bajo/hook/waibu@after-app-boot.js

@@ -3,7 +3,7 @@ import collectTeam from '../../../lib/collect-team.js'
 
 async function afterAppBoot () {
   const { runHook } = this.app.bajo
-  await runHook(`${this.name}:beforeBoot`)
+  await runHook(`${this.ns}:beforeBoot`)
   this.log.trace('collectingRouteGuards')
   await collectRoutes.call(this, 'secure')
   this.log.trace('secureRoutes%d', this.secureRoutes.length)
@@ -15,7 +15,7 @@ async function afterAppBoot () {
   await collectTeam.call(this)
   this.log.trace('teamRoutes%d', this.teamRoutes.length)
   this.log.trace('teamNegRoutes%d', this.teamNegRoutes.length)
-  await runHook(`${this.name}:afterBoot`)
+  await runHook(`${this.ns}:afterBoot`)
 }
 
 export default afterAppBoot

package/extend/bajo/intl/en-US.json

@@ -108,6 +108,7 @@
   "downloadList": "Download List",
   "manageDownload": "Manage Download",
   "userSession": "User Session",
+  "XHandler": "Twitter Account",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/extend/dobo/feature/address.js

@@ -40,7 +40,7 @@ async function address (opts = {}) {
       type: 'string',
       maxLength: 100
     }],
-    globalRules: [{
+    rules: [{
       rule: 'trim',
       fields: ['address1', 'address2', 'city', 'zipCode', 'provinceState', 'phone', 'website']
     }]

package/extend/dobo/feature/country.js

@@ -8,7 +8,7 @@ async function country (opts = {}) {
       index: opts.index ?? true,
       rules: ['uppercase', { rule: 'length', params: 2 }]
     }],
-    globalRules: [{ rule: 'trim', fields: [opts.fieldName] }]
+    rules: [{ rule: 'trim', fields: [opts.fieldName] }]
   }
 }
 

package/extend/dobo/feature/lat-lng.js

@@ -1,7 +1,7 @@
 import latLngHook from '../../../lib/lat-lng-hook.js'
 
 async function latLng (opts = {}) {
-  const { merge } = this.lib._
+  const { merge } = this.app.lib._
   opts.fieldNameLat = opts.fieldNameLat ?? 'lat'
   opts.fieldNameLng = opts.fieldNameLng ?? 'lng'
   opts.scale = opts.scale ?? 5
@@ -23,11 +23,11 @@ async function latLng (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
         await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
         await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
       }

package/extend/dobo/feature/lat.js

@@ -14,10 +14,10 @@ async function lat (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, opts)
       }
     }

package/extend/dobo/feature/lng.js

@@ -14,10 +14,10 @@ async function lng (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, opts)
       }
     }

package/extend/dobo/feature/site-id.js

@@ -4,11 +4,11 @@ async function siteId (opts = {}) {
       name: 'siteId',
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaUser',
+          model: 'SumbaUser',
           propName: 'id',
-          type: 'one-on-many'
+          type: '1:1'
         }
       },
       index: true

package/extend/dobo/feature/slug.js

@@ -1,12 +1,11 @@
 import slug from 'slug'
 
-async function autoInc ({ schema, body, opts }) {
-  const { recordFind } = this.app.dobo
-  const { set, last } = this.lib._
+async function autoInc (body, opts) {
+  const { set, last } = this.app.lib._
   const query = set({}, opts.fieldName, { $regex: new RegExp('^' + body[opts.fieldName]) })
   const sort = set({}, opts.fieldName, -1)
   const options = { noHook: true, skipCache: true, thrownNotFound: false }
-  const resp = await recordFind(schema.name, { query, limit: 1, sort }, options)
+  const resp = await this.findRecord({ query, limit: 1, sort }, options)
   if (resp.length === 0) return body[opts.fieldName]
   const rslugs = resp[0][opts.fieldName].split('-')
   const slugs = body[opts.fieldName].split('-')
@@ -23,7 +22,7 @@ async function autoInc ({ schema, body, opts }) {
       body[opts.fieldName] = slugs.join('-')
     }
   }
-  return await autoInc.call(this, { schema, body, opts })
+  return await autoInc.call(this, body, opts)
 }
 
 async function mainFn (opts = {}) {
@@ -38,9 +37,9 @@ async function mainFn (opts = {}) {
       index: 'unique'
     }],
     hook: {
-      beforeCreate: async function ({ schema, body }) {
+      beforeCreate: async function (body) {
         const { error } = this.app.bajo
-        const { isEmpty, isString } = this.lib._
+        const { isEmpty, isString } = this.app.lib._
         if (isEmpty(body[opts.fieldName])) {
           if (isString(opts.fieldSource)) opts.fieldSource = [opts.fieldSource]
           const source = []
@@ -53,7 +52,7 @@ async function mainFn (opts = {}) {
           }
           body[opts.fieldName] = slug(source.join(' '))
         }
-        if (opts.autoInc) body[opts.fieldName] = await autoInc.call(this, { schema, body, opts })
+        if (opts.autoInc) body[opts.fieldName] = await autoInc.call(this, body, opts)
       }
     }
   }