@steedos/service-fields-indexs 2.3.6 → 2.3.8

package/meteor-collection-indexs/instances.object.js

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@hotoa.com
  * @Date: 2022-02-28 09:25:03
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-01-10 11:59:22
+ * @LastEditTime: 2022-11-30 14:15:57
  * @Description: 
  */
 if (Meteor.isServer) {
@@ -16,7 +16,7 @@ if (Meteor.isServer) {
       background: true
     });
   } catch (error) {
-
+    
   }
   try {
     db.instances._ensureIndex({
@@ -25,7 +25,7 @@ if (Meteor.isServer) {
       background: true
     });
   } catch (error) {
-
+    
   }
   try {
     db.instances._ensureIndex({
@@ -34,7 +34,7 @@ if (Meteor.isServer) {
       background: true
     });
   } catch (error) {
-
+    
   }
   try {
     db.instances._ensureIndex({
@@ -43,7 +43,7 @@ if (Meteor.isServer) {
       background: true
     });
   } catch (error) {
-
+    
   }
   db.instances._ensureIndex({
     "space": 1,
@@ -225,7 +225,7 @@ if (Meteor.isServer) {
       background: true
     });
   } catch (error) {
-
+    
   }
   db.instances._ensureIndex({
     "record_ids.o": 1,
@@ -238,57 +238,4 @@ if (Meteor.isServer) {
   }, {
     background: true
   });
-
-  // 监控箱-管理员
-  try {
-    db.instances._ensureIndex({
-      space: 1,
-      state: 1,
-      submit_date: -1,
-    }, { background: true, name: 'monitor_admin' });
-  } catch (error) {
-
-  }
-
-  // 监控箱-用户
-  try {
-    db.instances._ensureIndex({
-      flow: 1,
-    }, { background: true });
-  } catch (error) {
-
-  }
-
-  // 草稿箱
-  try {
-    db.instances._ensureIndex({
-      space: 1,
-      submitter: 1,
-      state: 1,
-      modified: -1,
-    }, { background: true, name: 'draft' });
-  } catch (error) {
-
-  }
-
-  // 进行中
-  try {
-    db.instances._ensureIndex({
-      space: 1,
-      state: 1,
-      modified: -1,
-    }, { background: true, name: 'pending' });
-  } catch (error) {
-
-  }
-  try {
-    db.instances._ensureIndex({
-      space: 1,
-      state: 1,
-      applicant: 1,
-      modified: -1,
-    }, { background: true, name: 'pending_applicant' });
-  } catch (error) {
-
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-fields-indexs",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "main": "package.service.js",
   "license": "MIT",
   "dependencies": {
@@ -10,5 +10,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3ef6bf3744c616d6a961b3264e5f204b9697ef6a"
+  "gitHead": "b2393877080bbb08d758ce883522d37bc0a12ba2"
 }

package/package.service.js

@@ -35,9 +35,9 @@ module.exports = {
 			async handler(ctx) {
 				this.logger.debug(`refreshIndexes start`);
 				const objects = await ctx.call(`objects.getAll`, {});
-				for await (const object of objects) {
+				for await(const object of objects) {
 					const objectAPIName = object.metadata.name;
-					if (objectAPIName && !objectAPIName.startsWith('__')) {
+					if(objectAPIName && !objectAPIName.startsWith('__')){
 						await objectql.getObject(objectAPIName).refreshIndexes()
 					}
 				}
@@ -59,18 +59,6 @@ module.exports = {
 						console.error(`refresh indexe error: ${matchedPath}`, error);
 					}
 				});
-
-				const indexFilePatten = [
-					path.join(__dirname, 'collection-indexes', "*.index.js")
-				];
-				const matchedIndexPaths = metaDataCore.syncMatchFiles(indexFilePatten);
-				_.each(matchedIndexPaths, (matchedPath) => {
-					try {
-						require(matchedPath).run();
-					} catch (error) {
-						console.error(`refresh indexe error: ${matchedPath}`, error);
-					}
-				});
 				this.logger.debug(`refreshIndexes end`);
 				return 'success'
 			}
@@ -106,11 +94,11 @@ module.exports = {
 			let indexScheduleCron = "0 0 * * * *"; // 默认每小时执行一次
 			const steedosConfig = objectql.getSteedosConfig() || {};
 			const cron = steedosConfig.cron;
-			if (cron && cron.build_index) {
+			if(cron && cron.build_index){
 				indexScheduleCron = cron.build_index;
 			}
 			if (indexScheduleCron) {
-				this.job = schedule.scheduleJob(indexScheduleCron, () => {
+				this.job = schedule.scheduleJob(indexScheduleCron, ()=>{
 					this.broker.call(`${serviceName}.refreshIndexes`)
 				});
 			}
@@ -123,7 +111,7 @@ module.exports = {
 	 * Service stopped lifecycle event handler
 	 */
 	async stopped() {
-		if (this.job && this.job.cancel) {
+		if(this.job && this.job.cancel){
 			this.job.cancel()
 		}
 	}

package/collection-indexes/default_db.js

@@ -1,22 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2023-01-10 11:35:36
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-01-10 13:45:33
- * @Description: 
- */
-const objectql = require('@steedos/objectql')
-
-async function getCollection(collectionName) {
-    try {
-        const adapter = objectql.getObject(collectionName).datasource.adapter
-        await adapter.connect()
-        return adapter.collection(collectionName);
-    } catch (error) {
-        return null
-    }
-}
-
-module.exports = {
-    getCollection
-}

package/collection-indexes/instance_tasks.index.js

@@ -1,52 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2023-01-10 11:28:54
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-01-10 14:33:11
- * @Description: 
- */
-const db = require('./default_db')
-
-
-async function run() {
-    const collection = await db.getCollection('instance_tasks')
-
-    // 待审核箱
-    try {
-        const indexName = 'inbox'
-        const indexExists = await collection.indexExists(indexName)
-        if (!indexExists) {
-            await collection.createIndex({
-                space: 1,
-                handler: 1,
-                is_finished: 1,
-                instance_state: 1,
-                distribute_from_instance: 1,
-                forward_from_instance: 1,
-                is_hidden: 1,
-                start_date: -1
-            }, { background: true, name: indexName })
-        }
-    } catch (error) {
-        console.error(error)
-    }
-    // 已审核箱
-    try {
-        const indexName = 'outbox'
-        const indexExists = await collection.indexExists(indexName)
-        if (!indexExists) {
-            await collection.createIndex({
-                space: 1,
-                handler: 1,
-                is_finished: 1,
-                finish_date: -1,
-            }, { background: true, name: indexName })
-        }
-    } catch (error) {
-        console.error(error)
-    }
-}
-
-module.exports = {
-    run
-}