@steedos/service-object-graphql 2.5.0-beta.3 → 2.5.0-beta.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-object-graphql",
-    "version": "2.5.0-beta.3",
+    "version": "2.5.0-beta.30",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,10 +15,12 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "48546b91b2a44dd6f6673af7f5ab707faff6e07c",
+    "gitHead": "d33d736a3009ecfe57981d03d7062e52eaf27609",
     "dependencies": {
-        "@steedos/i18n": "2.5.0-beta.3",
-        "@steedos/objectql": "2.5.0-beta.3",
+        "@steedos/filters": "2.5.0-beta.30",
+        "@steedos/i18n": "2.5.0-beta.30",
+        "@steedos/objectql": "2.5.0-beta.30",
+        "@steedos/service-object-mixin": "2.5.0-beta.30",
         "graphql": "^15.8.0",
         "graphql-parse-resolve-info": "^4.12.3",
         "moleculer": "^0.14.25",

package/package.service.js

@@ -1,13 +1,13 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-03-23 15:12:14
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-04-11 11:44:41
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-16 11:28:59
  * @Description: 
  */
 
 "use strict";
-const { SteedosDatabaseDriverType, getObject } = require('@steedos/objectql');
+const { SteedosDatabaseDriverType, getObject, getDataSource } = require('@steedos/objectql');
 const {
     generateActionGraphqlProp,
     generateSettingsGraphql,
@@ -16,6 +16,8 @@ const {
 } = require('./lib');
 const open = require('open');
 
+const { formatFiltersToODataQuery } = require("@steedos/filters");
+
 const serviceObjectMixin = require('@steedos/service-object-mixin');
 
 /**
@@ -27,6 +29,7 @@ module.exports = {
     mixins: [serviceObjectMixin],
 
     globalGraphQLSettings: {}, // service-api 里generateGraphQLSchema使用 
+    getGraphqlFields: getQueryFields,
 
     projectStarted: false,
 
@@ -71,26 +74,8 @@ module.exports = {
             async handler(ctx) {
                 const resolveInfo = ctx.meta.resolveInfo
                 const objectName = resolveInfo.fieldName
-                const objectConfig = await getObject(objectName).getConfig()
                 // filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
-                if (objectConfig.datasource.driver === SteedosDatabaseDriverType.MeteorMongo || objectConfig.datasource.driver === SteedosDatabaseDriverType.Mongo) {
-                    const { filters } = ctx.params;
-                    if (filters) {
-                        if (_.isString(filters)) {
-                            if (filters.indexOf('(is_deleted eq true)') < 0) {
-                                ctx.params.filters = `(${filters}) and (is_deleted ne true)`;
-                            }
-                        }
-                        if (_.isArray(filters)) {
-                            const filtersStr = formatFiltersToODataQuery(filters);
-                            if (filtersStr.indexOf('(is_deleted eq true)') < 0) {
-                                ctx.params.filters = [ctx.params.filters, ['is_deleted', '!=', true]]
-                            }
-                        }
-                    } else {
-                        ctx.params.filters = '(is_deleted ne true)'
-                    }
-                }
+                ctx.params.filters = await this.dealWithFilters(ctx.params.filters, objectName)
                 if (_.isEmpty(ctx.params.fields)) {
                     const { resolveInfo } = ctx.meta;
 
@@ -115,26 +100,8 @@ module.exports = {
             async handler(ctx) {
                 const resolveInfo = ctx.meta.resolveInfo
                 const objectName = resolveInfo.fieldName.replace('__count', '')
-                const objectConfig = await getObject(objectName).getConfig()
                 // filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
-                if (objectConfig.datasource.driver === SteedosDatabaseDriverType.MeteorMongo || objectConfig.datasource.driver === SteedosDatabaseDriverType.Mongo) {
-                    const { filters } = ctx.params;
-                    if (filters) {
-                        if (_.isString(filters)) {
-                            if (filters.indexOf('(is_deleted eq true)') < 0) {
-                                ctx.params.filters = `(${filters}) and (is_deleted ne true)`;
-                            }
-                        }
-                        if (_.isArray(filters)) {
-                            const filtersStr = formatFiltersToODataQuery(filters);
-                            if (filtersStr.indexOf('(is_deleted eq true)') < 0) {
-                                ctx.params.filters = [ctx.params.filters, ['is_deleted', '!=', true]]
-                            }
-                        }
-                    } else {
-                        ctx.params.filters = '(is_deleted ne true)'
-                    }
-                }
+                ctx.params.filters = await this.dealWithFilters(ctx.params.filters, objectName)
 
                 const userSession = ctx.meta.user;
                 return this.count(objectName, ctx.params, userSession)
@@ -300,7 +267,10 @@ module.exports = {
 
                 if (!this.projectStarted) {
                     this.projectStarted = true
-                    console.log('');
+                    // 开发环境, 显示耗时
+                    if(process.env.NODE_ENV == 'development' && global.__startDate){
+                        console.log('耗时: ' + (new Date().getTime() - global.__startDate.getTime()) + ' ms');
+                    }
                     console.log(`Project is running at ${process.env.ROOT_URL}`);
                     console.log('');
                     if (process.env.STEEDOS_AUTO_OPEN_BROWSER != 'false') { // 默认打开，如果不想打开，设置STEEDOS_AUTO_OPEN_BROWSER=false
@@ -447,6 +417,31 @@ module.exports = {
             };
 
             return objGraphqlMap
+        },
+
+        // filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
+        async dealWithFilters(filters, objectName) {
+            let newFilters = filters
+            const objectConfig = await getObject(objectName).getConfig()
+            const datasource = getDataSource(objectConfig.datasource)
+            if (datasource.driver === SteedosDatabaseDriverType.MeteorMongo || datasource.driver === SteedosDatabaseDriverType.Mongo) {
+                if (filters) {
+                    if (_.isString(filters)) {
+                        if (filters.indexOf('(is_deleted eq true)') < 0) {
+                            newFilters = `(${filters}) and (is_deleted ne true)`;
+                        }
+                    }
+                    if (_.isArray(filters)) {
+                        const filtersStr = formatFiltersToODataQuery(filters);
+                        if (filtersStr.indexOf('(is_deleted eq true)') < 0) {
+                            newFilters = [filters, ['is_deleted', '!=', true]]
+                        }
+                    }
+                } else {
+                    newFilters = '(is_deleted ne true)'
+                }
+            }
+            return newFilters
         }
     },