@steedos/standard-object-database 3.0.0-beta.2 → 3.0.0-beta.8

package/main/default/triggers/object_fields.trigger.js

@@ -1,38 +1,8 @@
-const InternalData = require('@steedos/standard-objects').internalData;
 var _ = require("underscore");
-const odataMongodb = require("@steedos/odata-v4-mongodb");
 const clone = require('clone');
-var objectCore = require('../server/objects.core.js');
 const objectql = require('@steedos/objectql');
 const register = require('@steedos/metadata-registrar');
-const auth = require('@steedos/auth');
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
-const validateOptionValue = (value)=>{
-    let color = value && value.split(":")[2];
-    if(color){
-        const reg = /^(#)?[\da-f]{3}([\da-f]{3})?$/i;
-        if(!reg.test(color)){
-            throw new Error("object_fields_error_option_color_not_valid");
-        }
-    }
-}
-
-const validateOptionsValue = (value)=>{
-    if(value){
-        value.split("\n").forEach(function(option) {
-            let options;
-            if (option.indexOf(",")) {
-                options = option.split(",");
-                return options.forEach(function(_option) {
-                    validateOptionValue(_option);
-                });
-            } else {
-                validateOptionValue(option);
-            }
-        });
-    }
-}
-
 const validateOptionColorValue = (value)=>{
     if(value){
         const reg = /^(#)?[\da-f]{6}$/i;
@@ -58,12 +28,6 @@ const validateOptionsGridValue = (value)=>{
 
 const validateDoc = (doc)=>{
     validateOptionsGridValue(doc.options);
-    // if(doc.type === "autonumber"){
-    //     let formula = doc.formula && doc.formula.trim();
-    //     if(!formula){
-    //         throw new Error("object_fields_error_formula_required");
-    //     }
-    // }
 }
 
 
@@ -76,7 +40,7 @@ async function checkOwnerField(doc) {
         const obj = objectql.getObject(doc.object);
         const masters = await obj.getMasters();
         if (masters && masters.length) {
-            throw new Meteor.Error(doc.name, "您无法取消勾选“新建、编辑时隐藏”属性，因为当前对象上有主表子表关系字段！");
+            throw new Error("您无法取消勾选“新建、编辑时隐藏”属性，因为当前对象上有主表子表关系字段！");
         }
     }
 }
@@ -87,7 +51,7 @@ function checkMasterDetailPathsRepeat(doc, masterPaths, detailPaths) {
         _.each(detailPaths, (detailPathItems) => {
             const repeatName = objectql.getRepeatObjectNameFromPaths([masterPathItems.concat(detailPathItems)]);
             if (repeatName) {
-                throw new Meteor.Error(doc.name, "您无法创建此类字段，因为在主表子表关系链条中存在同名对象：" + repeatName);
+                throw new Error("您无法创建此类字段，因为在主表子表关系链条中存在同名对象：" + repeatName);
             }
         });
     });
@@ -98,16 +62,16 @@ async function checkMasterDetailTypeField(doc, oldReferenceTo) {
         return;
     }
     if (doc.reference_to === doc.object) {
-        throw new Meteor.Error(doc.name, "您无法创建一个指向自身的[主表/子表]类型字段！");
+        throw new Error("您无法创建一个指向自身的[主表/子表]类型字段！");
     }
     const obj = objectql.getObject(doc.object);
     if (!obj) {
-        throw new Meteor.Error(doc.name, `所属对象未加载！`);
+        throw new Error(`所属对象未加载！`);
     }
 
     const refObj = objectql.getObject(doc.reference_to);
     if (!refObj) {
-        throw new Meteor.Error(doc.name, `引用对象未加载！`);
+        throw new Error(`引用对象未加载！`);
     }
 
     let currentMasters = await obj.getMasters();
@@ -120,17 +84,17 @@ async function checkMasterDetailTypeField(doc, oldReferenceTo) {
     }
 
     if (currentMasters.indexOf(doc.reference_to) > -1) {
-        throw new Meteor.Error(doc.name, `该对象上已经存在指向相同“引用对象”的其它主表子表关系，无法创建该字段。`);
+        throw new Error(`该对象上已经存在指向相同“引用对象”的其它主表子表关系，无法创建该字段。`);
     }
 
     const mastersCount = currentMasters.length;
     const detailsCount = currentDetails.length;
     if (mastersCount > 5) {
-        throw new Meteor.Error(doc.name, "您无法创建此类型的字段，因为此对象已有5种主表子表关系。");
+        throw new Error("您无法创建此类型的字段，因为此对象已有5种主表子表关系。");
     } 
     // else if (mastersCount > 0) { // 当前对象已经有1个主子表字段
     //     if (detailsCount > 0) { // 当前对象已经作为了其他对象的主子表字段的关联对象
-    //         throw new Meteor.Error(doc.name, "由于此对象上已经存在主表子表关系，同时是另一个主表子表关系的主对象，无法创建此类字段。");
+    //         throw new Error("由于此对象上已经存在主表子表关系，同时是另一个主表子表关系的主对象，无法创建此类字段。");
     //     }
     // }
 
@@ -143,19 +107,19 @@ async function checkMasterDetailTypeField(doc, oldReferenceTo) {
     const maxDetailLeave = await obj.getMaxDetailsLeave(detailPaths);
     // console.log("===maxDetailLeave===", maxDetailLeave);
     if (maxDetailLeave > MAX_MASTER_DETAIL_LEAVE - 1) {
-        throw new Meteor.Error(doc.name, "您无法创建此类字段，因为这将超出主表子表关系的最大深度。");
+        throw new Error("您无法创建此类字段，因为这将超出主表子表关系的最大深度。");
     }
 
     // 新加主表子表关系后，当前对象作为子表往上和往下加起来最多允许有MAX_DETAIL_LEAVE层深度。
     const maxMasterLeave = await refObj.getMaxMastersLeave(masterPaths);
     // console.log("===maxMasterLeave===", maxMasterLeave);
     if (maxMasterLeave + maxDetailLeave > MAX_MASTER_DETAIL_LEAVE - 1) {
-        throw new Meteor.Error(doc.name, "您无法创建此类字段，因为这将超出主表子表关系的最大深度。");
+        throw new Error("您无法创建此类字段，因为这将超出主表子表关系的最大深度。");
     }
     // let fields = await obj.getFields();
     // const ownerField = _.find(fields, (n) => { return n.name === "owner"; });
     // if (!ownerField.omit) {
-    //     throw new Meteor.Error(doc.name, "您无法创建此类字段，因为该对象上“所有者”字段未勾选“新建、编辑时隐藏”属性。");
+    //     throw new Error("您无法创建此类字段，因为该对象上“所有者”字段未勾选“新建、编辑时隐藏”属性。");
     // }
 }
 
@@ -175,9 +139,7 @@ const checkFormulaInfiniteLoop = async function(_doc, oldFieldName){
     if(_doc.type === "formula"){
       doc = clone(_doc)
       delete doc._id
-      const objectConfig = objectql.wrapAsync(async function(){
-        return await objectql.getObject(doc.object).toConfig();
-      })
+      const objectConfig = await objectql.getObject(doc.object).toConfig();
     //   objectCore.loadDBObject(objectConfig)
       delete objectConfig._id;
       try {
@@ -216,53 +178,6 @@ const initSummaryDoc = async (doc) => {
 }
 
 module.exports = {
-    afterFind: async function(){
-
-
-        _.each(this.data.values, (item)=>{
-            item.is_customize = true
-        })
-
-        let filters = InternalData.parserFilters(this.query.filters);
-        let objectName = filters.object;
-        if(!objectName && filters._id && filters._id.indexOf(".") > -1){
-            objectName = filters._id.split('.')[0];
-        }
-        if(objectName){ 
-            let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
-            if(fields){
-                const cloneValues = clone(this.data.values, false);
-                _.each(fields, (field)=>{
-                    if(!_.find(this.data.values, (item)=>{
-                        return item.object == field.object && item.name == field.name
-                    })){
-                        cloneValues.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
-                    }
-                })
-                // this.data.values = this.data.values.concat(fields)
-                this.data.values = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, this.spaceId);
-            }
-        }
-
-        const dbSystemField = _.find(this.data.values, (field)=>{return field.is_system && field._id && field._id.indexOf('.') == -1})
-        if(dbSystemField){
-            const obj = await InternalData.getObject(dbSystemField.object, this.userId)
-            if(obj){
-                this.data.values = _.map(this.data.values, (item)=>{
-                    if(item.is_system){
-                        const mField = _.find(obj.fields, (field)=>{return field.name === item.name})
-                        if(mField){
-                            return Object.assign(item, mField, mField?.override || {})
-                        }else{
-                            return item;
-                        }
-                    }else{
-                        return item;
-                    }
-                })
-            }
-        }
-    },
     beforeFind: async function(){
         const { query } = this;
         if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'object')){
@@ -274,37 +189,18 @@ module.exports = {
         if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'type')){
             query.fields.push('type')
         }
-
-
-        let filters = InternalData.parserFilters(this.query.filters);
-        if(filters._id && _.isString(filters._id) && filters._id.indexOf(".") > -1){
-            const [objectName, fieldName] = filters._id.split('.');
-            query.filters = [['object', '=', objectName], ['name', '=', fieldName]]
-        }
-
-       
-    },
-    afterCount: async function(){
-        let result = await objectql.getObject('object_fields').find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
-        this.data.values = result.length;
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let field = await InternalData.getObjectField(objectName, this.userId, id);
-                if(field){
-                    this.data.values = field;
-                }
-            }
-        }else{
-            this.data.values.is_customize = true
-        }
     },
     beforeInsert: async function () {
         let doc = this.doc;
         delete doc.is_customize
+
+        if(['name','owner','parent','children'].indexOf(doc._name)>-1 || doc._name && doc.is_system){
+            doc.name = doc._name;
+        }else{
+            doc.name = getFieldName(doc.object,doc._name,doc.space);
+        }
+
+
         validateDoc(doc);
         await checkFormulaInfiniteLoop(doc);
         await checkMasterDetailTypeField(doc);
@@ -319,10 +215,10 @@ module.exports = {
                 const value = item.value;
                 const numberValue = Number(item.value);
                 if( doc.data_type === 'number' && !(_.isNumber(numberValue) && !_.isNaN(numberValue)) ){
-                    throw new Meteor.Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入合法的数值。");
+                    throw new Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入合法的数值。");
                 }
                 if( doc.data_type === 'boolean' && ['true','false'].indexOf(value) < 0){
-                    throw new Meteor.Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入 true 或 false。");
+                    throw new Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入 true 或 false。");
                 }
             })
         }
@@ -331,15 +227,16 @@ module.exports = {
         let { doc, object_name, id} = this;
         delete doc.is_customize
         validateDoc(doc);
-        // const dbDoc = await objectql.getObject(object_name).findOne(id)
-        const dbDoc = objectql.wrapAsync(async function(){
-          return await objectql.getObject(object_name).findOne(id)
-        })
+        const dbDoc = await objectql.getObject(object_name).findOne(id)
 
         if(doc && _.has(doc, 'multiple') && doc.multiple != dbDoc.multiple){
             throw new Error('禁止单选、多选切换')
         }
 
+        if(_.has(doc, "_name") && dbDoc._name != doc._name){
+            doc.name = getFieldName(doc.object, doc._name, doc.space, doc.name);
+          }
+
         let oldReferenceTo = dbDoc.type === "master_detail" && dbDoc.reference_to;
         await checkFormulaInfiniteLoop(doc, dbDoc.name);
         await checkMasterDetailTypeField(doc, oldReferenceTo);
@@ -359,7 +256,7 @@ module.exports = {
                 isImportField = true;
             }
             if(isImportField){
-                throw new Meteor.Error(500, "字段parent、children是启用树状结构显示记录的对象的内置字段，不能修改其”所属对象、字段名、字段类型、引用对象、多选、新建/编辑时隐藏”等属性");
+                throw new Error(500, "字段parent、children是启用树状结构显示记录的对象的内置字段，不能修改其”所属对象、字段名、字段类型、引用对象、多选、新建/编辑时隐藏”等属性");
             }
         }
 
@@ -369,11 +266,11 @@ module.exports = {
                 const value = item.value;
                 const numberValue = Number(item.value);
                 if( doc.data_type === 'number' && !(_.isNumber(numberValue) && !_.isNaN(numberValue)) ){
-                    throw new Meteor.Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入合法的数值。");
+                    throw new Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入合法的数值。");
                 }
                 // console.log('doc==>',doc.data_type , value)
                 if( doc.data_type === 'boolean' && ['true','false'].indexOf(value) < 0){
-                    throw new Meteor.Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入 true 或 false。");
+                    throw new Error(500, "选择项中的选项值类型应该与数据类型值一致, 请输入 true 或 false。");
                 }
             })
         }
@@ -399,7 +296,7 @@ module.exports = {
         const field = await this.getObject(this.object_name).findOne(this.id,{fields:['name','object']});
         const enable_tree = await objectql.getObject(field.object).enable_tree;
         if( ["parent","children"].indexOf(field.name) > -1 && enable_tree ){
-            throw new Meteor.Error(500, "启用树状结构显示记录的对象不能删除parent、children字段。");
+            throw new Error(500, "启用树状结构显示记录的对象不能删除parent、children字段。");
         }
     },
 

package/main/default/triggers/object_layouts.trigger.js

@@ -1,8 +1,5 @@
 const _ = require("underscore");
 const objectql = require('@steedos/objectql');
-const auth = require('@steedos/auth');
-const InternalData = require('@steedos/standard-objects').internalData;
-const util = require('@steedos/standard-objects').util
 function check(spaceId, objectName, profiles, id){
     let query = {
         object_name: objectName,
@@ -43,7 +40,7 @@ module.exports = {
         let doc = this.doc
         check(this.spaceId, doc.object_name, doc.profiles);
 
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true], ['object_name','=', doc.object_name]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true], ['object_name','=', doc.object_name]]);
 
         if(doc.fields){
             _.each(doc.fields, function(field){
@@ -59,7 +56,7 @@ module.exports = {
         let record = Creator.getCollection("object_layouts").findOne({_id: id}) || {};
         check(this.spaceId, doc.object_name || record.object_name, doc.profiles || record.profiles, id);
         if (_.has(doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', doc.name, this.id, [['is_system','!=', true], ['object_name','=', doc.object_name || record.object_name]]);
+            await objectql.checkAPIName(this.object_name, 'name', doc.name, this.id, [['is_system','!=', true], ['object_name','=', doc.object_name || record.object_name]]);
         }
 
         if(doc.fields){
@@ -69,88 +66,5 @@ module.exports = {
                 }
             })
         }
-    },
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let layouts = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let layout = await InternalData.getObjectLayout(id);
-                if(layout){
-                    layouts = [layout]
-                }
-            }
-        }else if(filters.object_name){
-            layouts = await InternalData.getObjectLayouts(filters.object_name, this.spaceId);
-        }
-
-        layouts = await getInternalLatouts(layouts, filters);
-
-        if(layouts){
-            this.data.values = this.data.values.concat(_.filter(layouts, function(layout){return layout._id && layout._id.indexOf('.') > 0 }))
-        }
-    },
-    afterAggregate: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let layouts = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let layout = await InternalData.getObjectLayout(id);
-                if(layout){
-                    layouts = [layout]
-                }
-            }
-        }else if(filters.object_name){
-            layouts = await InternalData.getObjectLayouts(filters.object_name, this.spaceId);
-        }
-
-        layouts = await getInternalLatouts(layouts, filters);
-
-        if(layouts){
-            this.data.values = this.data.values.concat(_.filter(layouts, function(layout){return layout._id && layout._id.indexOf('.') > 0 }))
-        }
-    },
-    afterCount: async function(){
-        // let result = await objectql.getObject('object_layouts').find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
-        // this.data.values = result.length;
-        let filters = InternalData.parserFilters(this.query.filters)
-        let layouts = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let layout = await InternalData.getObjectLayout(id);
-                if(layout){
-                    layouts = [layout]
-                }
-            }
-        }else if(filters.object_name){
-            layouts = await InternalData.getObjectLayouts(filters.object_name, this.spaceId);
-        }
-
-        layouts = await getInternalLatouts(layouts, filters);
-        
-        if(layouts){
-            this.data.values = this.data.values + _.filter(layouts, function(layout){return layout._id && layout._id.indexOf('.') > 0 }).length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let objectName = id.substr(0, id.indexOf("."));
-            if(objectName){
-                let layout = await InternalData.getObjectLayout(id);
-                if(layout){
-                    this.data.values = layout;
-                }
-            }
-        }
     }
 }

package/main/default/triggers/object_listviews.trigger.js

@@ -1,37 +1,22 @@
-const InternalData = require('@steedos/standard-objects').internalData;
-const util = require('@steedos/standard-objects').util;
 const objectql = require('@steedos/objectql');
 const auth = require("@steedos/auth");
-
-const getInternalListviews = async function(sourceListviews, filters, is_system){
-    let collection = await objectql.getObject("object_listviews");
-    let dbListviews = await collection.directFind({filters, fields:['_id', 'name']});
-    let listviews = [];
-
-    if(!is_system){
-        _.forEach(sourceListviews, function(doc){
-            if(!_.find(dbListviews, function(p){
-                return p.name === doc.name
-            })){
-                listviews.push(doc);
-            }
-        })
-    }
-    return listviews;
-}
-
+const _ = require('underscore');
 module.exports = {
     beforeInsert: async function () {
         const { userId, spaceId } = this;
+        const obj = objectql.getObject("object_listviews")
         if(userId && spaceId){
             const userSession = await auth.getSessionByUserId(userId, spaceId);
             if(userSession){
-                const { allowCreateListViews } = await objectql.getObject("object_listviews").getUserObjectPermission(userSession, false);
+                const { allowCreateListViews } = await obj.getUserObjectPermission(userSession, false);
                 if(!allowCreateListViews){
                     throw new Error('没有权限创建视图')
                 }
             }
         }
+        if(!this.doc._id){
+            this.doc._id = await obj._makeNewID()
+        }
         if (!this.doc.name) {
             this.doc.name = 'listview_' + this.doc._id.toLowerCase();
         }
@@ -43,7 +28,7 @@ module.exports = {
                 }
             ]
         }
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true], ['object_name','=', this.doc.object_name]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true], ['object_name','=', this.doc.object_name]]);
     },
     beforeUpdate: async function () {
         const oldDoc = await objectql.getObject(this.object_name).findOne(this.id)
@@ -60,111 +45,7 @@ module.exports = {
             throw new Error('禁止修改「all」视图的API Name')
         }
 
-        await util.checkAPIName(this.object_name, 'name', name, this.id, [['is_system','!=', true], ['object_name','=', object_name]]);
-    },
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let views = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            if(_.isString(id)){
-                id = id.replace(/\\/g, ''); // string类型才有replce方法
-                let objectName = id.substr(0, id.indexOf("."));
-                if(objectName){
-                    let view = await InternalData.getObjectListView(objectName, this.userId, id);
-                    if(view){
-                        views = [view];
-                    }
-                }
-            }
-            else if (id.$in) {
-                for (const _id of id.$in) {
-                    if(_.isString(_id) && _id.indexOf('.') > 0){
-                        let objectName = _id.split('.')[0];
-                        let view = await InternalData.getObjectListView(objectName, this.userId, _id);
-                        if(view){
-                            if (_.isArray(this.query.fields)) {
-                                const fields = ["_id"].concat(this.query.fields);
-                                view = _.pick(view, fields);
-                            }
-                            views.push(view);
-                        }
-                    }
-                }
-            }
-        }else if(filters.object_name){
-            views = await InternalData.getObjectListViews(filters.object_name, this.userId);
-        }
-
-        views = await getInternalListviews(views, this.query.filters, filters.is_system);
-
-        if(views){
-            this.data.values = this.data.values.concat(views)
-        }
-    },
-    afterAggregate: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let views = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            if(_.isString(id)){
-                let objectName = id.substr(0, id.indexOf("."));
-                if(objectName){
-                    let view = await InternalData.getObjectListView(objectName, this.userId, id);
-                    if(view){
-                        views = [view];
-                    }
-                }
-            }
-        }else if(filters.object_name){
-            views = await InternalData.getObjectListViews(filters.object_name, this.userId);
-        }
-
-        views = await getInternalListviews(views, this.query.filters, filters.is_system);
-
-        if(views){
-            this.data.values = this.data.values.concat(views)
-        }
-    },
-    afterCount: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let views = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            if(_.isString(id)){
-                let objectName = id.substr(0, id.indexOf("."));
-                if(objectName){
-                    let view = await InternalData.getObjectListView(objectName, this.userId, id);
-                    if(view){
-                        views = [view];
-                    }
-                }
-            }
-        }else if(filters.object_name){
-            views = await InternalData.getObjectListViews(filters.object_name, this.userId);
-        }
-
-        views = await getInternalListviews(views, this.query.filters, filters.is_system);
-
-        if(views){
-            this.data.values = this.data.values + views.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            if(_.isString(id)){
-                let objectName = id.substr(0, id.indexOf("."));
-                if(objectName){
-                    let view = await InternalData.getObjectListView(objectName, this.userId, id);
-                    if(view){
-                        this.data.values = view;
-                    }
-                }
-            }
-        }
+        await objectql.checkAPIName(this.object_name, 'name', name, this.id, [['is_system','!=', true], ['object_name','=', object_name]]);
     },
     beforeDelete: async function(){
         const { id } = this;

package/main/default/triggers/object_validation_rules.trigger.js

@@ -4,58 +4,16 @@
  * @Description: 
  */
 const _ = require("underscore");
-const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
-const register = require('@steedos/metadata-registrar')
-const auth = require('@steedos/auth');
-const clone = require('clone');
 
 module.exports = {
-    beforeFind: async function(){
-        delete this.query.fields;
-    },
-    afterFind: async function(){
-        const { spaceId } = this;
-        let dataList = await register.getAllObjectValidationRules();
-        if (!_.isEmpty(dataList)) {
-            const cloneValues = clone(this.data.values, false);
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    cloneValues.push(doc);
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
-            }
-        }
-
-    },
-    afterCount: async function(){
-        delete this.query.fields;
-        let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
-        this.data.values = result.length;
-    },
-    afterFindOne: async function(){
-        if (_.isEmpty(this.data.values)) {
-            const all = await register.getAllObjectValidationRules();
-            const id = this.id;
-            this.data.values = _.find(all, function (item) {
-                return item._id === id
-            });
-        }
-    },
     beforeInsert: async function () {
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
 
     },
     beforeUpdate: async function () {
         if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
+            await objectql.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
         }
     }
 }