@steedos/service-objectql 2.7.27-beta.6 → 3.0.0-beta.100

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-objectql",
-    "version": "2.7.27-beta.6",
+    "version": "3.0.0-beta.100",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -13,8 +13,8 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "4cc6978a51be2b5b8efcad8ec8adba467df6e02a",
+    "gitHead": "89c69deb3ceb9d9e97c70ee23694ccecf1b4ce2b",
     "dependencies": {
-        "@steedos/objectql": "2.7.27-beta.6"
+        "@steedos/objectql": "3.0.0-beta.100"
     }
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-03-23 15:12:14
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-05-11 13:44:56
+ * @LastEditTime: 2025-01-16 16:55:42
  * @Description: 
  */
 "use strict";
@@ -12,6 +12,8 @@ const { getObject } = objectql;
 
 const { ObjectId } = require('mongodb');
 
+const _ = require('lodash');
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -569,8 +571,12 @@ module.exports = {
             async handler(ctx) {
                 return await this.getPrimarySpaceId()
             }
+        },
+        getPrimarySpace: {
+            async handler(ctx) {
+                return await this.getPrimarySpace()
+            }
         }
-
     },
 
     /**
@@ -651,6 +657,34 @@ module.exports = {
             }
             this.primarySpaceId = spaceId
             return this.primarySpaceId
+        },
+         getPrimarySpace: async function () {
+            if(this.primarySpace){
+                return this.primarySpace;
+            }
+            const steedosConfig = objectql.getSteedosConfig();
+            let spaceId;
+            if (steedosConfig && steedosConfig.tenant && steedosConfig.tenant._id) {
+                spaceId = steedosConfig.tenant._id
+            }
+
+            const datasource = objectql.getDataSource('default');
+            if (datasource) {
+                const adapter = datasource.adapter;
+                await adapter.connect()
+                const collection = adapter.collection('spaces');
+                let space = null;
+                if (spaceId) {
+                    space = await collection.findOne({ _id: spaceId })
+                }else{
+                    space = await collection.findOne()
+                }
+
+                if (space) {
+                    this.primarySpace = space;
+                }
+            }
+            return this.primarySpace
         }
     },