sumba 2.15.0 → 2.15.1

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

@@ -9,9 +9,8 @@ export async function checker (modelName, id, options = {}) {
   await rebuildFilter.call(this, modelName, filter, 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 row = await model.findOneRecord(filter, { count: false })
+  if (!row) throw this.app.dobo.error('recordNotFound%s%s', id, this.name, { statusCode: 404 })
 }
 
 const doboBeforeGetRecord = {

package/extend/dobo/feature/slug.js

@@ -5,9 +5,9 @@ async function autoInc (body, opts) {
   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 this.findRecord({ query, limit: 1, sort }, options)
-  if (resp.length === 0) return body[opts.fieldName]
-  const rslugs = resp[0][opts.fieldName].split('-')
+  const resp = await this.findOneRecord({ query, sort }, options)
+  if (resp) return body[opts.fieldName]
+  const rslugs = resp[opts.fieldName].split('-')
   const slugs = body[opts.fieldName].split('-')
   let num
   if (Number(last(rslugs)) && body[opts.fieldName] === rslugs.slice(0, rslugs.length - 1).join('-')) {

package/extend/waibuMpa/route/help/contact-form.js

@@ -3,7 +3,7 @@ const contactForm = {
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
     const { pick } = this.app.lib._
-    const { createRecord, findRecord } = this.app.waibuDb
+    const { createRecord, findAllRecord } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}
     const form = defaultsDeep(req.body, def)
@@ -17,7 +17,7 @@ const contactForm = {
         error = err
       }
     }
-    const cats = await findRecord({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    const cats = await findAllRecord({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', dataOnly: true } })
     return await reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
   }
 }

package/extend/waibuMpa/route/help/trouble-tickets/add.js

@@ -4,7 +4,7 @@ const add = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
-    const { createRecord, findRecord } = this.app.waibuDb
+    const { createRecord, findAllRecord } = this.app.waibuDb
     const options = {}
     const form = defaultsDeep(req.body, {})
     let error
@@ -16,7 +16,7 @@ const add = {
         error = err
       }
     }
-    const cats = await findRecord({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    const cats = await findAllRecord({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', dataOnly: true } })
     return await reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
   }
 }

package/extend/waibuMpa/route/help/trouble-tickets/details/@id.js

@@ -4,10 +4,10 @@ const id = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { cloneDeep } = this.app.lib._
-    const { createRecord, findRecord, getSchemaExt } = this.app.waibuDb
+    const { createRecord, findOneRecord, findRecord, getSchemaExt } = this.app.waibuDb
     const { schema } = await getSchemaExt(model, 'list')
 
-    const master = (await findRecord({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id }, limit: 1 } }))[0]
+    const master = await findOneRecord({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id } } })
     if (!master) throw this.error('_notFound')
     const form = cloneDeep(req.body)
     let error

package/extend/waibuMpa/route/user/activation.js

@@ -8,10 +8,10 @@ const userActivation = {
     if (req.method === 'POST') {
       try {
         const query = { status: 'UNVERIFIED', token: req.body.key }
-        const result = await model.findRecord({ query, limit: 1 })
-        if (result.length === 0) throw this.error('validationError', { details: [{ field: 'key', error: 'invalidActivationKey' }] })
+        const result = await model.findOneRecord({ query })
+        if (result) throw this.error('validationError', { details: [{ field: 'key', error: 'invalidActivationKey' }] })
         await model.transaction(async (trx) => {
-          await model.updateRecord(result[0].id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true, trx })
+          await model.updateRecord(result.id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true, trx })
         })
         req.flash('notify', req.t('userActivated'))
         return reply.redirectTo(this.config.redirect.signin, req)

package/extend/waibuMpa/route/user/forgot-password/@fpl.js

@@ -1,16 +1,15 @@
-
 async function getUser (req, reply) {
   const { dayjs } = this.app.lib
-  const { findRecord } = this.app.waibuDb
+  const { findOneRecord } = this.app.waibuDb
   const invalidFpl = 'sumba.template:/user/fpl-invalid.html'
   if (Buffer.from(req.params.fpl, 'base64').toString('base64') !== req.params.fpl) return invalidFpl
   const fpToken = Buffer.from(req.params.fpl, 'base64').toString()
   const [token, sec] = fpToken.split(':')
   if (dayjs().unix() > Number(sec)) return invalidFpl
   const query = { token, status: 'ACTIVE' }
-  const users = await findRecord({ model: 'SumbaUser', req, options: { query, limit: 1, dataOnly: true, noHook: true } })
-  if (users.length === 0) return invalidFpl
-  return users[0]
+  const user = await findOneRecord({ model: 'SumbaUser', req, options: { query, dataOnly: true, noHook: true } })
+  if (user) return invalidFpl
+  return user
 }
 
 const forgotPasswordLink = {

package/extend/waibuMpa/route/user/forgot-password.js

@@ -11,9 +11,8 @@ const profile = {
     if (req.method === 'POST') {
       try {
         const query = { status: 'ACTIVE', $or: [{ username: req.body.usernameEmail }, { email: req.body.usernameEmail }] }
-        const result = await model.findRecord({ query, limit: 1 }, { dataOnly: true, noHook: true, forceNoHidden: true })
-        if (result.length === 0) throw this.error('validationError', { details: [{ field: 'usernameEmail', error: 'unknownUsernameEmailOrInactive' }] })
-        const data = result[0]
+        const data = await model.findOneRecord({ query }, { dataOnly: true, noHook: true, forceNoHidden: true })
+        if (data) throw this.error('validationError', { details: [{ field: 'usernameEmail', error: 'unknownUsernameEmailOrInactive' }] })
         const to = `${data.firstName} ${data.lastName} <${data.email}>`
         const subject = req.t('forgotPasswordLink')
         const options = { req, reply }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -6,6 +6,7 @@
 - [2.15.0] Add admin sub route for inter site modules
 - [2.15.0] Bug fix in ```createNewSite()```
 - [2.15.0] Bug fix in ```removeSite()```
+- [2.15.1] Code cleanups
 
 ## 2026-03-27