@steedos/service-fields-indexs 2.5.12-beta.9 → 2.5.12

package/collection-indexes/instance_tasks.index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-01-10 11:28:54
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-01-10 14:33:11
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-08-27 11:00:46
  * @Description: 
  */
 const db = require('./default_db')
@@ -17,14 +17,12 @@ async function run() {
         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
+                space: 1,
+                start_date: -1,
+                category: 1,
+                is_deleted: 1,
             }, { background: true, name: indexName })
         }
     } catch (error) {
@@ -36,10 +34,29 @@ async function run() {
         const indexExists = await collection.indexExists(indexName)
         if (!indexExists) {
             await collection.createIndex({
-                space: 1,
                 handler: 1,
                 is_finished: 1,
+                space: 1,
                 finish_date: -1,
+                category: 1,
+                is_deleted: 1,
+            }, { background: true, name: indexName })
+        }
+    } catch (error) {
+        console.error(error)
+    }
+
+
+    // 推送badge计算
+    try {
+        const indexName = 'push_badge'
+        const indexExists = await collection.indexExists(indexName)
+        if (!indexExists) {
+            await collection.createIndex({
+                handler: 1,
+                is_finished: 1,
+                space: 1,
+                category: 1,
             }, { background: true, name: indexName })
         }
     } catch (error) {

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

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@hotoa.com
  * @Date: 2022-02-28 09:25:03
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-08-15 23:24:59
+ * @LastEditTime: 2023-08-20 10:33:17
  * @Description: 
  */
 if (Meteor.isServer) {
@@ -36,15 +36,7 @@ if (Meteor.isServer) {
   } catch (error) {
 
   }
-  try {
-    db.instances._ensureIndex({
-      "inbox_users": 1
-    }, {
-      background: true
-    });
-  } catch (error) {
 
-  }
   db.instances._ensureIndex({
     "space": 1,
     "is_deleted": 1
@@ -82,109 +74,7 @@ if (Meteor.isServer) {
   }, {
     background: true
   });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "final_decision": 1,
-    "submitter": 1,
-    "applicant": 1
-  }, Steedos.formatIndex(["is_deleted", "state", "space", "final_decision", "submitter", "applicant"]));
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "space": 1,
-    "modified": 1,
-    "outbox_users": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "modified": 1,
-    "final_decision": 1,
-    "submitter": 1,
-    "applicant": 1
-  }, Steedos.formatIndex(["is_deleted", "state", "space", "modified", "final_decision", "submitter", "applicant"]));
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "space": 1,
-    "outbox_users": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "space": 1,
-    "modified": 1,
-    "submit_date": 1,
-    "outbox_users": 1
-  }, Steedos.formatIndex(["is_deleted", "space", "modified", "submit_date", "outbox_users"]));
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "space": 1,
-    "submit_date": 1,
-    "outbox_users": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "flow": 1,
-    "modified": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "flow": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "flow": 1,
-    "submit_date": 1,
-    "modified": 1
-  }, Steedos.formatIndex(["is_deleted", "state", "space", "flow", "submit_date", "modified"]));
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "flow": 1,
-    "submit_date": 1
-  }, {
-    background: true
-  });
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "submitter": 1,
-    "applicant": 1,
-    "inbox_users": 1
-  }, Steedos.formatIndex(["is_deleted", "state", "space", "submitter", "applicant", "inbox_users"]));
-  db.instances._ensureIndex({
-    "is_deleted": 1,
-    "state": 1,
-    "space": 1,
-    "is_archive": 1,
-    "submitter": 1,
-    "applicant": 1
-  }, Steedos.formatIndex(["is_deleted", "state", "space", "is_archive", "submitter", "applicant"]));
 
-  db.instances._ensureIndex({
-    "cc_users": 1
-  }, {
-    background: true
-  });
   db.instances._ensureIndex({
     "space": 1,
     "state": 1,
@@ -263,61 +153,14 @@ if (Meteor.isServer) {
   // 监控箱-用户
   try {
     db.instances._ensureIndex({
-      submitter: 1,
-      submit_date: -1,
-      category: 1,
-      state: 1,
-      is_deleted: 1,
-      space: 1
-    });
-  } catch (error) {
-
-  }
-  try {
-    db.instances._ensureIndex({
-      applicant: 1,
-      submit_date: -1,
-      category: 1,
-      state: 1,
-      is_deleted: 1,
-      space: 1
-    });
-  } catch (error) {
-
-  }
-  try {
-    db.instances._ensureIndex({
-      inbox_users: 1,
-      submit_date: -1,
-      category: 1,
-      state: 1,
-      is_deleted: 1,
-      space: 1
-    });
-  } catch (error) {
-
-  }
-  try {
-    db.instances._ensureIndex({
-      outbox_users: 1,
+      space: 1,
       submit_date: -1,
-      category: 1,
-      state: 1,
-      is_deleted: 1,
-      space: 1
-    });
-  } catch (error) {
-
-  }
-  try {
-    db.instances._ensureIndex({
       flow: 1,
-      submit_date: -1,
       category: 1,
       state: 1,
       is_deleted: 1,
-      space: 1
-    });
+      name: 1,
+    }, { background: true, name: 'monitor_user' });
   } catch (error) {
 
   }
@@ -355,3 +198,29 @@ if (Meteor.isServer) {
 
   }
 }
+
+// 推送
+try {
+  db.instances._ensureIndex({
+    inbox_users: 1,
+    category: 1,
+  },
+    {
+      background: true, name: 'push_manager_inbox_users_category'
+    });
+} catch (error) {
+
+}
+
+try {
+  db.instances._ensureIndex({
+    cc_users: 1,
+    category: 1,
+  },
+    {
+      background: true, name: 'push_manager_cc_users_category'
+    });
+} catch (error) {
+
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-fields-indexs",
-  "version": "2.5.12-beta.9",
+  "version": "2.5.12",
   "main": "package.service.js",
   "license": "MIT",
   "dependencies": {
@@ -10,5 +10,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eed1149008c250335088c8e342d47c6fbde77ed5"
+  "gitHead": "cdf06aa70a7b55d8dae3fdd62bb24d8fe004b5c9"
 }