dobo 1.0.19 → 1.0.20

package/bajo/method/attachment/copy-uploaded.js

@@ -3,7 +3,6 @@ import path from 'path'
 async function copyUploaded (name, id, options = {}) {
   const { fs } = this.app.bajo.lib
   const { omit } = this.app.bajo.lib._
-  console.log(omit(options, ['req']))
   const { req, setField, setFile, mimeType, stats, silent = true } = options
   name = this.attachmentPreCheck(name)
   if (!name) {

package/bajo/method/record/create.js

@@ -4,6 +4,7 @@ import checkUnique from '../../../lib/check-unique.js'
 import handleAttachmentUpload from '../../../lib/handle-attachment-upload.js'
 import execValidation from '../../../lib/exec-validation.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
+import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function create (name, input, opts = {}) {
   const { generateId, runHook, isSet } = this.app.bajo
@@ -49,6 +50,7 @@ async function create (name, input, opts = {}) {
     nbody[k] = v
   })
   record = await handler.call(this.app[driver.ns], { schema, body: nbody, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (options.req) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id: body.id, body, options, action: 'create' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordCreated'))

package/bajo/method/record/find-one.js

@@ -32,12 +32,12 @@ async function findOne (name, filter = {}, opts = {}) {
   }
   const record = await handler.call(this.app[driver.ns], { schema, filter, options })
   record.data = record.data[0]
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFindOne`, filter, options, record)
     await runHook(`${this.name}:afterRecordFindOne`, name, filter, options, record)
   }
   record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
-  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (set && !noCache) await set({ model: name, filter, options, record })
   return dataOnly ? record.data : record
 }

package/bajo/method/record/find.js

@@ -30,6 +30,7 @@ async function find (name, filter = {}, opts = {}) {
     }
   }
   const records = await handler.call(this.app[driver.ns], { schema, filter, options })
+  if (isSet(options.rels)) await multiRelRows.call(this, { schema, records: records.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFind`, filter, options, records)
     await runHook(`${this.name}:afterRecordFind`, name, filter, options, records)
@@ -37,7 +38,6 @@ async function find (name, filter = {}, opts = {}) {
   for (const idx in records.data) {
     records.data[idx] = await this.pickRecord({ record: records.data[idx], fields, schema, hidden, forceNoHidden })
   }
-  if (isSet(options.rels)) await multiRelRows.call(this, { schema, records: records.data, options })
   if (set && !noCache) await set({ model: name, filter, options, records })
   return dataOnly ? records.data : records
 }

package/bajo/method/record/get.js

@@ -27,12 +27,12 @@ async function get (name, id, opts = {}) {
     }
   }
   const record = await handler.call(this.app[driver.ns], { schema, id, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordGet`, id, options, record)
     await runHook(`${this.name}:afterRecordGet`, name, id, options, record)
   }
   record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
-  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
 
   if (set && !noCache) await set({ model: name, id, options, record })
   return dataOnly ? record.data : record

package/bajo/method/record/update.js

@@ -3,6 +3,7 @@ import checkUnique from '../../../lib/check-unique.js'
 import handleAttachmentUpload from '../../../lib/handle-attachment-upload.js'
 import execValidation from '../../../lib/exec-validation.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
+import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function update (name, id, input, opts = {}) {
   const { runHook, isSet } = this.app.bajo
@@ -39,6 +40,7 @@ async function update (name, id, input, opts = {}) {
   })
   delete nbody.id
   const record = await handler.call(this.app[driver.ns], { schema, id, body: nbody, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (options.req) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id, body, options, action: 'update' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordUpdated'))

package/lib/single-rel-rows.js

@@ -10,7 +10,7 @@ async function singleRelRows ({ schema, record, options = {} }) {
         const val = prop.rel[key]
         if (val.fields.length === 0) continue
         const relschema = this.getSchema(val.schema)
-        const relFilter = options.filter
+        const relFilter = options.filter ?? {}
         const query = {}
         query[val.propName] = record[prop.name]
         relFilter.query = query

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -5,7 +5,7 @@ async function attachment (req, reply) {
   const mime = await importPkg('waibu:mime')
   const { fs } = this.app.bajo.lib
   const file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
-  if (!fs.existsSync(file)) throw this.error('_notFound')
+  if (!fs.existsSync(file)) throw this.error('_notFound', { noView: true })
   const mimeType = mime.getType(path.extname(file))
   reply.header('Content-Type', mimeType)
   const stream = fs.createReadStream(file)