@steedos/migrate 2.3.4 → 2.3.6

package/README.md

@@ -1,3 +1,10 @@
+<!--
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2021-05-24 12:32:57
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-01-11 16:54:20
+ * @Description: 
+-->
 Steedos Migration Scripts
 ===
 
@@ -7,8 +14,9 @@ Migrate steedos database with [node-migrate](https://github.com/tj/node-migrate)
 
 ### DB Connection
 
-set database connection in steedos-config.yml
+项目根目录下执行 node 进入node控制台
 
+在node控制台执行 `require('dotenv-flow').config(); ` 目的是为了读取.env.local设置 `process.env.MONGO_URL`
 ### Migrate up
 
 open nodejs console.
@@ -27,15 +35,9 @@ var migrate = require("@steedos/migrate");
 migrate.down();
 ```
 
-### Enable auto migrate for steedos
+### Default auto migrate for steedos
 
-steedos-config.yml
-
-```yml
-datasources:
-  default:
-    auto_migrate: true
-```
+config STEEDOS_DB_AUTO_MIGRATE=false in .env.local to disable auto migrate
 
 ### Add migration script
 

package/client.js

@@ -0,0 +1,13 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2021-05-24 12:32:57
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-01-11 11:51:05
+ * @Description: 
+ */
+
+const { MongoClient } = require("mongodb");
+
+const client = new MongoClient(process.env.MONGO_URL, { useNewUrlParser: true, useUnifiedTopology: true });
+
+module.exports = client;

package/index.js

@@ -1,69 +1,67 @@
-var migrate = require('migrate')
-var path = require('path');
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2021-05-24 12:32:57
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-01-13 14:21:44
+ * @Description: 
+ */
+const migrate = require('migrate')
+const path = require('path');
+const validator = require('validator');
 
-var stateStore = path.join(process.cwd(), '.migrate');
-var migrationsDirectory = path.join(__dirname, 'migrations'); 
+const stateStore = path.join(process.cwd(), '.steedos', '.migrate');
+const migrationsDirectory = path.join(__dirname, 'migrations');
 
-// let Fiber = require('fibers');
-
-const up = async function() {
+const up = async function () {
 
     migrate.load({
         stateStore: stateStore,
         migrationsDirectory: migrationsDirectory
     }, function (err, set) {
         if (err) {
-          throw err
+            throw err
         }
         set.up(function (err) {
-          if (err) {
-            throw err
-          }
-          console.log('DB migrations up successfully.')
+            if (err) {
+                throw err
+            }
+
         })
     })
 }
 
-const init = async function() {
-    var objectql = require("@steedos/objectql");
-    if (objectql.getSteedosConfig().datasources.default.auto_migrate)
+const init = async function () {
+    if (process.env.STEEDOS_DB_AUTO_MIGRATE !== false && process.env.STEEDOS_DB_AUTO_MIGRATE !== 'false') {
+        // 如果未设置为不自动执行，则默认自动执行
+        process.env.STEEDOS_DB_AUTO_MIGRATE = 'true'
+    }
+    const autoMigrate = validator.toBoolean(process.env.STEEDOS_DB_AUTO_MIGRATE || '', true);
+    // console.log('process.env.STEEDOS_DB_AUTO_MIGRATE:', process.env.STEEDOS_DB_AUTO_MIGRATE)
+    // console.log('autoMigrate:', autoMigrate)
+    if (autoMigrate) {
         up();
+    }
 }
 
-const down = async function() {
+const down = async function () {
     migrate.load({
         stateStore: stateStore,
         migrationsDirectory: migrationsDirectory
     }, function (err, set) {
         if (err) {
-          throw err
+            throw err
         }
         set.down(function (err) {
-          if (err) {
-            throw err
-          }
-          console.log('DB migrations down successfully.')
+            if (err) {
+                throw err
+            }
+            console.log('DB migrations down successfully.')
         })
     })
 }
 
-// const upSync = function(){
-//   Fiber(function(){
-//       let fiber = Fiber.current;
-//       up.then(result => {
-//           fiber.run();
-//       }).catch(result => {
-//           console.error(result)
-//           fiber.run();
-//       })
-//       Fiber.yield();
-//   }).run();
-// }
-
-
 module.exports = {
     init: init,
     up: up,
-    // upSync: upSync,
     down: down
 }

package/migrations/1673342303163-add-instance-tasks.js

@@ -0,0 +1,88 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2023-01-10 17:18:23
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-02-11 10:49:47
+ * @Description: 
+ */
+'use strict'
+
+const client = require("../client");
+
+module.exports.up = async function (next) {
+    await client.connect()
+    const db = client.db()
+    const instanceColl = db.collection('instances')
+    const tasksColl = db.collection('instance_tasks')
+    // 若已有instance_tasks则不执行
+    const tasksCount = await tasksColl.find({}).count()
+    if (tasksCount > 0) {
+        // console.log('[migration]', '库中已有instance_tasks，终止执行。')
+        return;
+    }
+    console.log('[migration] add-instance-tasks is running...')
+    await instanceColl.find({}).forEach(async function (insDoc) {
+        var docs = [];
+        var latestApproveIndexMap = {}
+        insDoc.traces.forEach(function (tDoc, tIdx) {
+            if (tIdx == 0 && (!insDoc.distribute_from_instance && !insDoc.forward_from_instance)) {
+                // 只有分发或转发的申请单，开始节点生成instance_tasks
+                return
+            }
+            if (tDoc.approves) {
+                tDoc.approves.forEach(function (aDoc) {
+                    if (aDoc.type == 'distribute' || aDoc.judge == 'relocated' || aDoc.judge == 'terminated' || aDoc.judge == 'reassigned') {
+                        return;
+                    }
+                    aDoc['space'] = insDoc.space;
+                    aDoc['instance_name'] = insDoc.name;
+                    aDoc['submitter'] = insDoc.submitter;
+                    aDoc['submitter_name'] = insDoc.submitter_name;
+                    aDoc['applicant'] = insDoc.applicant;
+                    aDoc['applicant_name'] = insDoc.applicant_name;
+                    aDoc['applicant_organization_name'] = insDoc.applicant_organization_name;
+                    aDoc['submit_date'] = insDoc.submit_date;
+                    aDoc['flow'] = insDoc.flow;
+                    aDoc['flow_name'] = insDoc.flow_name;
+                    aDoc['form'] = insDoc.form;
+                    aDoc['step'] = tDoc.step;
+                    aDoc['step_name'] = tDoc.name;
+                    aDoc['category_name'] = insDoc.category_name;
+                    aDoc['instance_state'] = insDoc.state;
+                    aDoc['distribute_from_instance'] = insDoc.distribute_from_instance;
+                    aDoc['forward_from_instance'] = insDoc.forward_from_instance;
+                    aDoc['keywords'] = insDoc.keywords;
+                    aDoc['is_archived'] = insDoc.is_archived;
+                    aDoc['category'] = insDoc.category;
+                    docs.push(aDoc)
+                    if (aDoc.is_finished) { //记录下需要设置is_latest_approve的游标，如有重复审批则更新为最新的
+                        latestApproveIndexMap[aDoc.handler] = docs.length - 1
+                    }
+                })
+            }
+        })
+
+        for (const handler in latestApproveIndexMap) {
+            if (Object.hasOwnProperty.call(latestApproveIndexMap, handler)) {
+                docs[latestApproveIndexMap[handler]].is_latest_approve = true
+            }
+        }
+
+        if (docs.length > 0) {
+            try {
+                await tasksColl.insertMany(docs);
+            } catch (e) {
+                print(e);
+                printjson(docs.length)
+            }
+        }
+    })
+    const insCount = await instanceColl.find({}).count()
+    const insTasksCount = await tasksColl.find({}).count()
+    console.log('[migration] add-instance-tasks successfully ran.', 'instances:', insCount, ', instance_tasks:', insTasksCount)
+}
+
+module.exports.down = async function (next) {
+    const tasksColl = db.collection('instance_tasks')
+    await tasksColl.remove({})
+}

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@steedos/migrate",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "Migration scripts for steedos",
   "main": "index.js",
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "migrate": "^1.6.2"
+    "migrate": "^1.6.2",
+    "mongodb": "^3.7.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "adfbf2b14c15751d6702d8e127426ac1d9d813eb"
+  "gitHead": "3ef6bf3744c616d6a961b3264e5f204b9697ef6a"
 }

package/db.js

@@ -1,10 +0,0 @@
-
-var objectql = require("@steedos/objectql");
-
-var mongoUrl = objectql.getSteedosConfig().datasources.default.connection.url;
-
-var SteedosMongoDriver = objectql.SteedosMongoDriver;
-
-let driver = new SteedosMongoDriver({ url: process.env.MONGO_URL });
-
-module.exports = driver;