@steedos/service-package-registry 2.2.25 → 2.2.26

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

@@ -1,20 +1,73 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-28 09:35:35
+ * @Description: 
+ */
 const packages = require('../manager/packages');
+const objectql = require('@steedos/objectql');
+const auth = require('@steedos/auth');
 const _ = require('lodash');
 module.exports = {
     listenTo: 'steedos_packages',
-    afterFindOne: async function(){
-        const allPackages = await packages.getAllPackages();
-        Object.assign(this.data.values, _.find(allPackages, (package)=>{
-            return package._id == this.id
-        }))
+    beforeFind: async function () {
+        delete this.query.fields;
+    },
+
+    beforeAggregate: async function () {
+        delete this.query.fields;
     },
+
     afterFind: async function(){
-        this.data.values = await packages.getAllPackages()
+        const { spaceId } = this;
+        let dataList = await packages.getAllPackages();
+        if (!_.isEmpty(dataList)) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value.name === doc.name
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
+
     },
     afterAggregate: async function(){
-        this.data.values = await packages.getAllPackages()
+        const { spaceId } = this;
+        let dataList = await packages.getAllPackages();
+        if (!_.isEmpty(dataList)) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value.name === doc.name
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
     },
     afterCount: async function(){
-        this.data.values = (await packages.getAllPackages()).length;
+        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 packages.getAllPackages();
+            const id = this.id;
+            this.data.values = _.find(all, function(item){
+                return item._id === id
+            });
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-package-license": "2.2.25",
-    "@steedos/service-package-loader": "2.2.25",
+    "@steedos/service-package-license": "2.2.26",
+    "@steedos/service-package-loader": "2.2.26",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -27,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e81092f007bce951b627a5c28e286032afbba1fb"
+  "gitHead": "77fa3c2b6bdfebaccb4b7f0886f32eb347cbdd35"
 }