dobo 1.0.10 → 1.0.12

package/bajo/method/prep-pagination.js

@@ -1,5 +1,6 @@
 function buildPageSkipLimit (filter) {
   let limit = parseInt(filter.limit) || this.config.default.filter.limit
+  if (limit === -1) limit = this.config.default.filter.maxLimit
   if (limit > this.config.default.filter.maxLimit) limit = this.config.default.filter.maxLimit
   if (limit < 1) limit = 1
   let page = parseInt(filter.page) || 1

package/bajo/method/record/count.js

@@ -28,8 +28,8 @@ async function count (name, filter = {}, opts = {}) {
   }
   const count = await handler.call(this.app[driver.ns], { schema, filter, options })
   if (!noHook) {
-    await runHook(`${this.name}.${camelCase(name)}:afterRecordFind`, filter, options, count)
-    await runHook(`${this.name}:afterRecordFind`, name, filter, options, count)
+    await runHook(`${this.name}.${camelCase(name)}:afterRecordCount`, filter, options, count)
+    await runHook(`${this.name}:afterRecordCount`, name, filter, options, count)
   }
   if (set && !noCache) await set({ model: name, filter, options, count })
   return dataOnly ? count.data : count

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

@@ -9,12 +9,15 @@ async function findOne (name, filter = {}, opts = {}) {
   options.req = opts.req
   options.dataOnly = options.dataOnly ?? true
   let { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
-  await this.modelExists(name, true)
-  filter.limit = 1
   options.count = false
   options.dataOnly = false
+  await this.modelExists(name, true)
+  filter.limit = 1
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-find', options)
   if (!schema.cacheable) noCache = true
+  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  if (options.queryHandler) filter.query = await options.queryHandler.call(opts.req ? this.app[opts.req.ns] : this, filter.query, opts.req)
+  filter.match = this.buildMatch({ input: filter.match, schema, options }) ?? {}
   if (!noHook) {
     await runHook(`${this.name}:beforeRecordFindOne`, name, filter, options)
     await runHook(`${this.name}.${camelCase(name)}:beforeRecordFindOne`, filter, options)

package/bajoI18N/resource/en-US.json

@@ -1,6 +1,7 @@
 {
   "field": {
     "id": "ID",
+    "code": "Kode",
     "name": "Name",
     "dt": "Date/Time",
     "createdAt": "Created At",
@@ -50,7 +51,8 @@
     "theme": "Theme",
     "token": "Token",
     "field": "Field",
-    "agree": "Agreement"
+    "agree": "Agreement",
+    "method": "Metode"
   },
   "validation": {
     "any.required": "Required",

package/bajoI18N/resource/id.json

@@ -74,6 +74,7 @@
   "Data Export": "Ekspor Data",
   "field": {
     "id": "ID",
+    "code": "Kode",
     "name": "Nama",
     "dt": "Tgl/Jam",
     "createdAt": "Dibuat Pada",
@@ -123,7 +124,8 @@
     "theme": "Tema",
     "token": "Token",
     "field": "Field",
-    "agree": "Persetujuan"
+    "agree": "Persetujuan",
+    "method": "Metode"
   },
   "Validation Error": "Kesalahan Validasi",
   "validation": {

package/package.json

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