core: add history for psdoc,ddoc,drdoc

packages/hydrooj/TODO

@@ -11,7 +11,7 @@ message.markAsRead
 解离mail模块
 存储系统抽象化
 extend problem settings
-+oplog
 将系统设置存于本地而非数据库
 添加nav排序功能
 自动拓扑组件加载顺序？
+add declarations to psdoc

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.13.24",
+    "version": "2.13.25",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/entry/common.ts

@@ -29,7 +29,6 @@ export const builtinHandler = [
 
 export const builtinScript = [
     'rating', 'difficulty', 'problemStat', 'blacklist', 'deleteUser',
-    'upgrade0_1',
 ];
 
 function getFiles(folder: string, base = ''): string[] {

packages/hydrooj/src/entry/master.ts

@@ -58,10 +58,14 @@ export async function load(call: Entry) {
     require('../service/monitor');
     for (const i of builtinModel) require(`../model/${i}`);
     const modelSystem = require('../model/system');
-    const dbVer = await modelSystem.get('db.ver');
+    const scripts = require('../upgrade');
-    if (dbVer !== 1) {
+    let dbVer = (await modelSystem.get('db.ver')) || 0;
-        const ins = require('../script/upgrade0_1');
+    const expected = scripts.length;
-        await ins.run({ username: 'Root', password: 'rootroot' });
+    while (dbVer < expected) {
+        logger.info('Upgrading database: from %d to %d', dbVer, expected);
+        await scripts[dbVer]();
+        dbVer++;
+        await modelSystem.set('db.ver', dbVer);
     }
     bus.serial('app/started');
     return await modelSystem.get('server.worker');

packages/hydrooj/src/interface.ts

@@ -330,6 +330,11 @@ export interface Bdoc {
     expireAt: Date,
 }
 
+export interface HistoryDoc {
+    content: string,
+    time: Date,
+}
+
 // Discussion
 export interface Ddoc extends Document {
     docType: document['TYPE_DISCUSSION'],
@@ -344,6 +349,7 @@ export interface Ddoc extends Document {
     updateAt: Date,
     nReply: number,
     views: number,
+    history: HistoryDoc[],
 }
 
 // Discussion reply
@@ -355,6 +361,7 @@ export interface Drdoc extends Document {
     ip: string,
     content: string,
     reply: Drrdoc[],
+    history: HistoryDoc[],
 }
 
 // Discussion Tail Reply
@@ -363,6 +370,7 @@ export interface Drrdoc {
     owner: number,
     content: string,
     ip: string,
+    history: HistoryDoc[],
 }
 
 export interface TokenDoc {

packages/hydrooj/src/model/domain.ts

@@ -1,4 +1,5 @@
 import { Dictionary } from 'lodash';
+import { FilterQuery } from 'mongodb';
 import { BUILTIN_ROLES, PRIV } from './builtin';
 import { DomainDoc } from '../interface';
 import * as db from '../service/db';
@@ -46,7 +47,7 @@ export function get(domainId: string): Promise<DomainDoc | null> {
     return coll.findOne({ _id: domainId });
 }
 
-export function getMulti(query: any = {}) {
+export function getMulti(query: FilterQuery<DomainDoc> = {}) {
     return coll.find(query);
 }
 

packages/hydrooj/src/model/problem.ts

@@ -121,11 +121,8 @@ export async function getList(
     if (pdocs.length !== pids.length) {
         for (const pid of pids) {
             if (!(r[pid] || l[pid])) {
-                if (doThrow) {
+                if (doThrow) throw new ProblemNotFoundError(domainId, pid);
-                    throw new ProblemNotFoundError(domainId, pid);
+                else r[pid] = pdocHidden;
-                } else {
-                    r[pid] = pdocHidden;
-                }
             }
         }
     }

packages/hydrooj/src/script/upgrade0_1.ts

@@ -1,13 +0,0 @@
-import * as domain from '../model/domain';
-
-export const description = 'Upgrade database from 0 to 1';
-
-export async function run() {
-    const ddoc = await domain.get('system');
-    if (!ddoc) await domain.add('system', 0, 'Hydro', 'Hydro System');
-    // TODO discussion node?
-}
-
-export const validate = {};
-
-global.Hydro.script.upgrade0_1 = { run, description, validate };

packages/hydrooj/src/upgrade.ts

@@ -0,0 +1,34 @@
+/* eslint-disable no-await-in-loop */
+import * as domain from './model/domain';
+import * as document from './model/document';
+
+type UpgradeScript = () => Promise<void>;
+
+const scripts: UpgradeScript[] = [
+    // Init
+    async function _0_1() {
+        const ddoc = await domain.get('system');
+        if (!ddoc) await domain.add('system', 0, 'Hydro', 'Hydro System');
+        // TODO discussion node?
+    },
+    // Add history column to ddoc,drdoc,psdoc
+    async function _1_2() {
+        const domains = await domain.getMulti().project({ _id: 1 }).toArray();
+        for (const d of domains) {
+            const bulk = document.coll.initializeUnorderedBulkOp();
+            await document.getMulti(d._id, document.TYPE_DISCUSSION).forEach((ddoc) => {
+                bulk.find({ _id: ddoc._id }).updateOne({ $set: { history: [] } });
+            });
+            await document.getMulti(d._id, document.TYPE_DISCUSSION_REPLY).forEach((drdoc) => {
+                bulk.find({ _id: drdoc._id }).updateOne({ $set: { history: [] } });
+            });
+            // TODO tail reply
+            await document.getMulti(d._id, document.TYPE_PROBLEM_SOLUTION).forEach((psdoc) => {
+                bulk.find({ _id: psdoc._id }).updateOne({ $set: { history: [] } });
+            });
+            if (bulk.length) await bulk.execute();
+        }
+    },
+];
+
+export = scripts;

packages/hydrooj/test/db.ts

@@ -6,8 +6,15 @@ export async function connect() {
         const db = require('hydrooj/src/service/db');
         db.bus.once('connect', resolve);
     });
-    const script = require('../src/script/upgrade0_1');
+    const modelSystem = require('hydrooj/src/model/system');
-    await script.run();
+    const scripts = require('hydrooj/src/upgrade');
+    let dbVer = (await modelSystem.get('db.ver')) || 0;
+    const expected = scripts.length;
+    while (dbVer < expected) {
+        await scripts[dbVer]();
+        dbVer++;
+        await modelSystem.set('db.ver', dbVer);
+    }
 }
 
 export async function dispose() {

packages/migrate-vijos/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/migrate-vijos",
-    "version": "1.3.8",
+    "version": "1.3.9",
     "main": "package.json",
     "repository": "git@github.com:hydro-dev/Hydro.git",
     "author": "undefined <masnn0@outlook.com>",
@@ -14,7 +14,7 @@
         "@types/mongodb": "^3.5.27"
     },
     "peerDependencies": {
-        "hydrooj": "^2.13.5"
+        "hydrooj": "^2.13.25"
     },
     "dependencies": {
         "js-yaml": "^3.14.0",

packages/migrate-vijos/script.ts

@@ -73,6 +73,7 @@ const tasks = {
                         content: r.content,
                         owner: r.owner_uid,
                         ip: r.ip,
+                        history: [],
                     };
                     res.push(drrdoc);
                 }