waibu-db 2.10.2 → 2.11.0

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

@@ -37,6 +37,7 @@
   "tsv": "TSV",
   "ndjson": "NDJSON",
   "dataValue": "Data value",
+  "suppressedError": "Error occured and suppressed. Please check error log for details",
   "op": {
     "equals": "Equals",
     "notEquals": "Not Equals",

package/extend/bajo/intl/id.json

@@ -37,6 +37,7 @@
   "tsv": "TSV",
   "ndjson": "NDJSON",
   "dataValue": "Nilai data",
+  "suppressedError": "Kesalahan terjadi dan tidak ditampilkan. Silahkan cek log kesalahan untuk detilnya",
   "op": {
     "equals": "Sama Dengan",
     "notEquals": "Tidak Sama Dengan",

package/lib/method/count-record.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function countRecord ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -8,7 +8,7 @@ async function countRecord ({ model, req, reply, options = {}, transaction } = {
     return await mdl.countRecord(filter, opts)
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'countRecord', model: mdl, handler, options: opts })
 }
 
 export default countRecord

package/lib/method/create-aggregate.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function createAggregate ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -13,7 +13,7 @@ async function createAggregate ({ model, req, reply, options = {}, transaction }
     return await mdl.createAggregate(filter, params, opts)
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'createAggregate', model: mdl, handler, options: opts })
 }
 
 export default createAggregate

package/lib/method/create-histogram.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function createHistogram ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -13,7 +13,7 @@ async function createHistogram ({ model, req, reply, options = {}, transaction }
     return await mdl.createHistogram(filter, params, opts)
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'createHistogram', model: mdl, handler, options: opts })
 }
 
 export default createHistogram

package/lib/method/create-record.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function createRecord ({ model, req, reply, body, options = {}, transaction } = {}) {
   const { model: mdl, input, opts, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, options, args: ['model'], transaction })
@@ -10,7 +10,7 @@ async function createRecord ({ model, req, reply, body, options = {}, transactio
     return ret
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'createRecord', model: mdl, handler, options: opts })
 }
 
 export default createRecord

package/lib/method/find-all-record.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function findAllRecord ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -14,7 +14,7 @@ async function findAllRecord ({ model, req, reply, options = {}, transaction } =
     return ret
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'findAllRecord', model: mdl, handler, options: opts })
 }
 
 export default findAllRecord

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

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function findOneRecord ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -10,7 +10,7 @@ async function findOneRecord ({ model, req, reply, options = {}, transaction } =
     return ret
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'findOneRecord', model: mdl, handler, options: opts })
 }
 
 export default findOneRecord

package/lib/method/find-record.js

@@ -1,4 +1,4 @@
-import { prepCrud } from '../util.js'
+import { prepCrud, processHandler } from '../util.js'
 
 async function findRecord ({ model, req, reply, options = {}, transaction } = {}) {
   const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
@@ -14,7 +14,7 @@ async function findRecord ({ model, req, reply, options = {}, transaction } = {}
     return ret
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'findRecord', model: mdl, handler, options: opts })
 }
 
 export default findRecord

package/lib/method/get-record.js

@@ -1,4 +1,4 @@
-import { prepCrud, getOneRecord } from '../util.js'
+import { prepCrud, getOneRecord, processHandler } from '../util.js'
 
 async function getRecord ({ model, req, reply, id, options = {}, transaction } = {}) {
   const { model: mdl, recId, filter, attachment, stats, mimeType, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction })
@@ -8,10 +8,10 @@ async function getRecord ({ model, req, reply, id, options = {}, transaction } =
     opts.trx = opts.trx || trx
     const data = await getOneRecord.call(me, mdl, recId, filter, opts)
     if (attachment) data._attachment = await mdl.findAttachment(data.id, { stats, mimeType })
-    return { data }
+    return data
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'getRecord', model: mdl, handler, options: opts })
 }
 
 export default getRecord

package/lib/method/remove-record.js

@@ -1,4 +1,4 @@
-import { prepCrud, getOneRecord } from '../util.js'
+import { prepCrud, getOneRecord, processHandler } from '../util.js'
 
 async function removeRecord ({ model, req, reply, id, options = {}, transaction } = {}) {
   const { model: mdl, recId, opts, filter } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction })
@@ -6,11 +6,12 @@ async function removeRecord ({ model, req, reply, id, options = {}, transaction
 
   async function handler (trx) {
     opts.trx = opts.trx || trx
-    opts._data = await getOneRecord.call(me, mdl, recId, filter, opts)
+    const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
+    opts._data = resp.data
     return await mdl.removeRecord(recId, opts)
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'removeRecord', model: mdl, handler, options: opts })
 }
 
 export default removeRecord

package/lib/method/update-record.js

@@ -1,4 +1,4 @@
-import { prepCrud, getOneRecord } from '../util.js'
+import { prepCrud, getOneRecord, processHandler } from '../util.js'
 
 async function updateRecord ({ model, req, reply, id, body, options = {}, transaction } = {}) {
   const { model: mdl, filter, input, opts, recId, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, id, options, args: ['model', 'id'], transaction })
@@ -6,13 +6,14 @@ async function updateRecord ({ model, req, reply, id, body, options = {}, transa
 
   async function handler (trx) {
     opts.trx = opts.trx || trx
-    opts._data = await getOneRecord.call(me, mdl, recId, filter, opts)
+    const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
+    opts._data = resp.data
     const ret = await mdl.updateRecord(recId, input, opts)
     if (attachment) ret.data._attachment = await mdl.findAttachment(id, { stats, mimeType })
     return ret
   }
 
-  return opts.trx === true ? await mdl.transaction(handler) : await handler()
+  return await processHandler.call(this, { action: 'updateRecord', model: mdl, handler, options: opts })
 }
 
 export default updateRecord

package/lib/util.js

@@ -54,12 +54,29 @@ export async function prepCrud ({ model, body, id, req, reply, transaction, opti
 }
 
 export async function getOneRecord (model, id, filter, options) {
-  const { cloneDeep, pick } = this.app.lib._
+  const { cloneDeep, pick, isEmpty } = this.app.lib._
   let query = cloneDeep(filter.query || {})
   query = { $and: [query, { id }] }
   const opts = pick(options, ['forceNoHidden', 'trx', 'req', 'refs'])
-  opts.dataOnly = true
+  opts.dataOnly = false
   const data = await model.findOneRecord({ query }, opts)
-  if (!data && options.throwNotFound) throw this.error('_notFound')
+  if (isEmpty(data.data) && options.throwNotFound) throw this.error('_notFound')
   return data
 }
+
+export async function processHandler ({ action, model, handler, options } = {}) {
+  function suppressedReturn () {
+    if (action === 'countRecord') return options.dataOnly ? 0 : { data: 0, warnings: [options.req.t('supppressedError')] }
+    if (['createRecord', 'getRecord'].includes(action)) return options.dataOnly ? {} : { data: {}, warnings: [options.req.t('supppressedError')] }
+    if (action === 'removeRecord') return options.dataOnly ? {} : { oldData: {}, warnings: [options.req.t('supppressedError')] }
+    if (action === 'updateRecord') return options.dataOnly ? {} : { data: {}, oldData: {}, warnings: [options.req.t('supppressedError')] }
+    return options.dataOnly ? [] : { data: [], count: 0, page: 1, warnings: [options.req.t('supppressedError')] }
+  }
+
+  try {
+    return options.trx === true ? (await model.transaction(handler)) : (await handler())
+  } catch (err) {
+    if (options.suppressError) return suppressedReturn()
+    throw err
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.10.2",
+  "version": "2.11.0",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-03-26
+
+- [2.11.0] Adding ```suppressError``` to model options
+
+## 2026-03-25
+
+- [2.10.3] Bug fix in ```getOneRecord()```
+
 ## 2026-03-22
 
 - [2.10.1] Bug fix in reference records