dobo 1.1.16 → 1.1.18

package/bajo/intl/en-US.json

@@ -122,6 +122,7 @@
   "errorAddingFixture%s%s": "Error adding fixture on model '%s': %s",
   "memoryDbSkipped%s": "'%s' is a memory DB, skipped",
   "db": "DB",
+  "invalidQuery": "Invalid Query",
   "field": {
     "id": "ID",
     "code": "Kode",

package/bajo/intl/id.json

@@ -115,6 +115,7 @@
   "recordsAdded%s%d%d": "%s: %d of %d records added",
   "driverInstantiated%s%s": "- Driver '%s:%s' instantiated",
   "db": "DB",
+  "invalidQuery": "Kueri Tidak Valid",
   "field": {
     "id": "ID",
     "code": "Kode",

package/package.json

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

package/plugin/factory.js

@@ -267,10 +267,15 @@ async function factory (pkgName) {
     buildQuery = async ({ filter, schema, options = {} } = {}) => {
       const { trim, isString, isPlainObject } = this.lib._
       let query = {}
+      if (schema.name === 'SeatrackVessel') this.app.dump(filter)
       if (isString(filter.query)) {
-        filter.oquery = filter.query
-        if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
-        else query = nql(filter.query).parse()
+        try {
+          filter.oquery = filter.query
+          if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
+          else query = nql(filter.query).parse()
+        } catch (err) {
+          this.error('invalidQuery', { orgMessage: err.message })
+        }
       } else if (isPlainObject(filter.query)) query = filter.query
       return this.sanitizeQuery(query, schema)
     }

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

@@ -16,6 +16,7 @@ async function findOne (name, filter = {}, opts = {}) {
   options.dataOnly = false
   await this.modelExists(name, true)
   filter.limit = 1
+  filter.page = 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 }) ?? {}
@@ -34,6 +35,7 @@ async function findOne (name, filter = {}, opts = {}) {
     }
   }
   filter.limit = 1
+  filter.page = 1
   const record = options.record ?? (await handler.call(this.app[driver.ns], { schema, filter, options }))
   delete options.record
   record.data = record.data[0]