sumba 2.0.1 → 2.1.0

package/extend/dobo/feature/address.js

@@ -40,7 +40,7 @@ async function address (opts = {}) {
       type: 'string',
       maxLength: 100
     }],
-    globalRules: [{
+    rules: [{
       rule: 'trim',
       fields: ['address1', 'address2', 'city', 'zipCode', 'provinceState', 'phone', 'website']
     }]

package/extend/dobo/feature/country.js

@@ -8,7 +8,7 @@ async function country (opts = {}) {
       index: opts.index ?? true,
       rules: ['uppercase', { rule: 'length', params: 2 }]
     }],
-    globalRules: [{ rule: 'trim', fields: [opts.fieldName] }]
+    rules: [{ rule: 'trim', fields: [opts.fieldName] }]
   }
 }
 

package/extend/dobo/feature/lat-lng.js

@@ -23,11 +23,11 @@ async function latLng (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
         await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, merge({}, opts, { lat: opts.fieldNameLat }))
         await latLngHook.call(this, body, merge({}, opts, { lng: opts.fieldNameLng }))
       }

package/extend/dobo/feature/lat.js

@@ -14,10 +14,10 @@ async function lat (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, opts)
       }
     }

package/extend/dobo/feature/lng.js

@@ -14,10 +14,10 @@ async function lng (opts = {}) {
       scale: opts.scale
     }],
     hook: {
-      beforeCreate: async function ({ scheme, body }) {
+      beforeCreate: async function (body) {
         await latLngHook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ scheme, body }) {
+      beforeUpdate: async function (body) {
         await latLngHook.call(this, body, opts)
       }
     }

package/extend/dobo/feature/site-id.js

@@ -4,11 +4,11 @@ async function siteId (opts = {}) {
       name: 'siteId',
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaUser',
+          model: 'SumbaUser',
           propName: 'id',
-          type: 'one-on-many'
+          type: '1:1'
         }
       },
       index: true

package/extend/dobo/feature/slug.js

@@ -1,12 +1,11 @@
 import slug from 'slug'
 
-async function autoInc ({ schema, body, opts }) {
-  const { recordFind } = this.app.dobo
+async function autoInc (body, opts) {
   const { set, last } = this.app.lib._
   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 recordFind(schema.name, { query, limit: 1, sort }, options)
+  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 slugs = body[opts.fieldName].split('-')
@@ -23,7 +22,7 @@ async function autoInc ({ schema, body, opts }) {
       body[opts.fieldName] = slugs.join('-')
     }
   }
-  return await autoInc.call(this, { schema, body, opts })
+  return await autoInc.call(this, body, opts)
 }
 
 async function mainFn (opts = {}) {
@@ -38,7 +37,7 @@ async function mainFn (opts = {}) {
       index: 'unique'
     }],
     hook: {
-      beforeCreate: async function ({ schema, body }) {
+      beforeCreate: async function (body) {
         const { error } = this.app.bajo
         const { isEmpty, isString } = this.app.lib._
         if (isEmpty(body[opts.fieldName])) {
@@ -53,7 +52,7 @@ async function mainFn (opts = {}) {
           }
           body[opts.fieldName] = slug(source.join(' '))
         }
-        if (opts.autoInc) body[opts.fieldName] = await autoInc.call(this, { schema, body, opts })
+        if (opts.autoInc) body[opts.fieldName] = await autoInc.call(this, body, opts)
       }
     }
   }

package/extend/dobo/feature/status.js

@@ -9,7 +9,7 @@ async function status (opts = {}) {
       values: opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
     }],
     hook: {
-      beforeCreate: async function ({ body }) {
+      beforeCreate: async function (body) {
         const { isSet } = this.app.lib.aneka
         if (!isSet(body[opts.fieldName])) body[opts.fieldName] = opts.default
       }

package/extend/dobo/feature/team-id.js

@@ -4,11 +4,11 @@ async function teamId (opts = {}) {
       name: 'teamId',
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaSite',
+          model: 'SumbaSite',
           propName: 'id',
-          type: 'one-to-one'
+          type: '1:1'
         }
       },
       index: true

package/extend/dobo/feature/url.js

@@ -1,4 +1,4 @@
-async function hook (schema, body, options) {
+async function hook (body, options) {
   const { isSet } = this.app.lib.aneka
   let val = body[options.fieldName]
   if (!isSet(val)) return
@@ -16,11 +16,11 @@ async function url (opts = {}) {
       type: 'string'
     }],
     hook: {
-      beforeCreate: async function ({ schema, body }) {
-        await hook.call(this, schema, body, opts)
+      beforeCreate: async function (body) {
+        await hook.call(this, body, opts)
       },
-      beforeUpdate: async function ({ schema, body }) {
-        await hook.call(this, schema, body, opts)
+      beforeUpdate: async function (body) {
+        await hook.call(this, body, opts)
       }
     }
   }

package/extend/dobo/feature/user-id.js

@@ -5,16 +5,16 @@ async function userId (opts = {}) {
       name: opts.fieldName,
       type: 'string',
       maxLength: 50,
-      rel: {
+      ref: {
         site: {
-          schema: 'SumbaSite',
+          model: 'SumbaSite',
           propName: 'id',
-          type: 'one-to-one'
+          type: '1:1'
         },
         user: {
-          schema: 'SumbaUser',
+          model: 'SumbaUser',
           propName: 'id',
-          type: 'one-to-one',
+          type: '1:1',
           fields: ['id', 'username', 'email', 'firstName', 'lastName']
         }
       },

package/extend/dobo/fixture/site.json

@@ -13,9 +13,5 @@
   "website": "http://www.your-domain.com",
   "phone": "+001-000000001",
   "waPhone": "+001-111111111",
-  "socX": "XHandler",
-  "socFacebook": "FBHandler",
-  "socInstagram": "InstagramHandler",
-  "socLinkedIn": "LIHandler",
   "status": "ACTIVE"
 }]

package/extend/dobo/fixture/team.json

@@ -2,5 +2,6 @@
   "alias": "administrator",
   "name": "Administrator",
   "siteId": "?:SumbaSite::alias:default",
-  "status": "ENABLED"
+  "status": "ENABLED",
+  "_immutable": true
 }]

package/extend/dobo/model/contact-form-cat.json

@@ -0,0 +1,3 @@
+{
+  "features": ["sumba:category", "sumba:siteId"]
+}

package/extend/dobo/model/contact-form.json

@@ -0,0 +1,16 @@
+{
+  "properties": [
+    "firstName,,50,true,true",
+    "lastName,,50,true,true",
+    "email,,50,true,true",
+    "cat,,50,true",
+    "subject,,255,,true",
+    "message,text"
+  ],
+  "features": [{
+      "name": "sumba:status",
+      "default": "NEW",
+      "values": ["NEW", "ACK"]
+    }, "sumba:userId", "sumba:siteId", "dobo:createdAt", "dobo:updatedAt"
+  ]
+}

package/extend/dobo/model/download.json

@@ -0,0 +1,19 @@
+{
+  "properties": [
+    "description,,50,true",
+    "file,text,,,true",
+    "type,,20,true",
+    "jobQueue,object",
+    {
+      "name": "size",
+      "type": "integer",
+      "default": 0,
+      "index": true
+    }
+  ],
+  "features": ["sumba:siteId", "sumba:userId", "dobo:createdAt", "dobo:updatedAt", {
+    "name": "sumba:status",
+    "default": "INQUEUE",
+    "values": ["INQUEUE", "PROCESSING", "COMPLETE", "FAIL"]
+  }]
+}

package/extend/dobo/model/site-setting.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    "ns,,50,true,true",
+    "key,,50,true,true",
+    "value,text"
+  ],
+  "features": ["sumba:siteId", "dobo:updatedAt"]
+}

package/extend/dobo/{schema → model}/site.json

@@ -28,12 +28,8 @@
     "maxLength": 100,
     "rules": ["email"]
   }],
-  "feature": {
-    "sumba.personInCharge": true,
-    "sumba.address": true,
-    "sumba.social": true,
-    "sumba.status": { "default": "ACTIVE" },
-    "createdAt": true,
-    "updatedAt": true
-  }
+  "features": ["sumba:personInCharge", "sumba:address", "sumba:social", {
+    "name": "sumba:status",
+    "default": "ACTIVE"
+  }, "dobo:createdAt", "dobo:updatedAt"]
 }

package/extend/dobo/{schema → model}/team-user.json

@@ -4,23 +4,18 @@
     "type": "string",
     "maxLength": 50,
     "required": true,
-    "rel": {
+    "ref": {
       "team": {
-        "schema": "SumbaTeam",
+        "model": "SumbaTeam",
         "propName": "id",
-        "type": "one-to-one",
+        "type": "1:1",
         "fields": ["id", "name"]
       }
     }
   }],
   "indexes": [{
     "fields": ["userId", "siteId", "teamId"],
-    "unique": true
+    "type": "unique"
   }],
-  "feature": {
-    "createdAt": true,
-    "updatedAt": true,
-    "sumba.siteId": true,
-    "sumba.userId": true
-  }
+  "features": ["dobo:createdAt", "dobo:updatedAt", "sumba:siteId", "sumba:userId"]
 }

package/extend/dobo/model/team.json

@@ -0,0 +1,15 @@
+{
+  "properties": [
+    "alias,,20,,true",
+    "name,,50,true,true"
+  ],
+  "indexes": [{
+    "fields": ["alias", "siteId"],
+    "type": "unique"
+  }],
+  "features": ["dobo:createdAt", "dobo:updatedAt", "dobo:immutable", "sumba:siteId", {
+    "name": "sumba:status",
+    "default": "ENABLED",
+    "values": ["ENABLED", "DISABLED"]
+  }]
+}

package/extend/dobo/model/ticket-cat.json

@@ -0,0 +1,3 @@
+{
+  "features": ["sumba:category", "sumba:siteId"]
+}

package/extend/dobo/model/ticket-detail.json

@@ -0,0 +1,7 @@
+{
+  "properties": [
+    "masterId,,255,true,true",
+    "message,text"
+  ],
+  "features": ["dobo:createdAt", "sumba:userId", "sumba:siteId"]
+}

package/extend/dobo/model/ticket.json

@@ -0,0 +1,18 @@
+{
+  "properties": [
+    "subject,,255,true,true",
+    "cat,,50,true",
+    "message,text,,,true"
+  ],
+  "features": [
+    "dobo:createdAt",
+    "dobo:updatedAt",
+    "sumba:siteId",
+    "sumba:userId",
+    {
+      "name": "sumba:status",
+      "default": "OPEN",
+      "values": ["OPEN", "CLOSED"]
+    }
+  ]
+}

package/extend/dobo/{schema → model}/user.json

@@ -46,21 +46,24 @@
     "required": true,
     "index": true
   }],
-  "globalRules": [{ "rule": "trim", "fields": ["username", "firstName", "lastName"] }],
+  "rules": [{ "rule": "trim", "fields": ["username", "firstName", "lastName"] }],
   "indexes": [{
     "fields": ["username", "siteId"],
-    "unique": true
+    "type": "unique"
   }, {
     "fields": ["email", "siteId"],
-    "unique": true
+    "type": "unique"
   }],
   "hidden": ["password", "token"],
-  "feature": {
-    "sumba.address": true,
-    "sumba.social": true,
-    "sumba.status": { "default": "UNVERIFIED" },
-    "sumba.siteId": true,
-    "createdAt": true,
-    "updatedAt": true
-  }
+  "features": [
+    "sumba:address",
+    "sumba:social",
+    {
+      "name": "sumba:status",
+      "default": "UNVERIFIED"
+    },
+    "sumba:siteId",
+    "dobo:createdAt",
+    "dobo:updatedAt"
+  ]
 }