@steedos/service-objectql 2.6.1-beta.7 → 2.6.2-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-objectql",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -13,8 +13,8 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f",
+    "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31",
     "dependencies": {
-        "@steedos/objectql": "2.6.1-beta.7"
+        "@steedos/objectql": "2.6.2-beta.2"
     }
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-03-23 15:12:14
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-20 14:02:33
+ * @LastEditTime: 2023-11-14 10:43:21
  * @Description: 
  */
 "use strict";
@@ -10,6 +10,7 @@
 const objectql = require('@steedos/objectql');
 const { getObject } = objectql;
 
+const { ObjectId } = require('mongodb');
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -371,7 +372,7 @@ module.exports = {
         getRecordPermissionsById: {
             params: {
                 objectName: { type: "string" },
-                recordId: { type: "string" },
+                recordId: { type: "any" },
             },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
@@ -506,6 +507,38 @@ module.exports = {
                 const { objectName, doc } = ctx.params;
                 return await this.encryptFieldValue(objectName, doc);
             }
+        },
+        makeNewID: {
+            async handler(ctx) {
+                return new ObjectId().toHexString();
+            }
+        },
+        createIndex: {
+            params: {
+                objectName: { type: "string" },
+                fieldName: { type: "string" },
+            },
+            async handler(ctx) {
+                const { objectName, fieldName } = ctx.params;
+                const obj = getObject(objectName)
+                return await obj.createIndex(fieldName);
+            }
+        },
+        dropIndex: {
+            params: {
+                objectName: { type: "string" },
+                fieldName: { type: "string" },
+            },
+            async handler(ctx) {
+                const { objectName, fieldName } = ctx.params;
+                const obj = getObject(objectName)
+                return await obj.dropIndex(fieldName);
+            }
+        },
+        getPrimarySpaceId: {
+            async handler(ctx) {
+                return await this.getPrimarySpaceId()
+            }
         }
 
     },
@@ -564,6 +597,26 @@ module.exports = {
                 console.error(`[字段级加密] 对象${objectName}中字段加密失败：`, error);
             }
             return doc;
+        },
+        getPrimarySpaceId: async function () {
+            const steedosConfig = objectql.getSteedosConfig();
+            let spaceId;
+            if (steedosConfig && steedosConfig.tenant && steedosConfig.tenant._id) {
+                spaceId = steedosConfig.tenant._id
+            }
+            if (!spaceId) {
+                const datasource = objectql.getDataSource('default');
+                if (datasource) {
+                    const adapter = datasource.adapter;
+                    await adapter.connect()
+                    const collection = adapter.collection('spaces');
+                    const space = await collection.findOne()
+                    if (space) {
+                        spaceId = space._id;
+                    }
+                }
+            }
+            return spaceId
         }
     },