删除用户功能

hydro/model/problem.js

@@ -110,7 +110,7 @@ function count(domainId, query) {
 }
 
 async function random(domainId, query) {
-    const cursor = document.getMulti(domainId, query);
+    const cursor = document.getMulti(domainId, document.TYPE_PROBLEM, query);
     const pcount = await cursor.count();
     if (pcount) {
         const pdoc = await cursor.skip(Math.floor(Math.random() * pcount)).limit(1).toArray();

hydro/model/setting.js

@@ -1,6 +1,5 @@
 const moment = require('moment-timezone');
 const builtin = require('./builtin');
-const options = require('../options');
 
 const countries = moment.tz.countries();
 const tzs = new Set();

hydro/model/task.js

@@ -1,8 +1,10 @@
+const moment = require('moment-timezone');
 const db = require('../service/db');
 
 const coll = db.collection('task');
 
 async function add(task) {
+    task.executeAfter = task.executeAfter || new Date();
     const res = await coll.insertOne(task);
     return res.insertedId;
 }
@@ -20,9 +22,15 @@ function del(_id) {
 }
 
 async function getFirst(query) {
+    query.executeAfter = query.executeAfter || { $lte: new Date() };
     const res = await coll.find(query).sort('_id', 1).limit(1).toArray();
     if (res.length) {
         await coll.deleteOne({ _id: res[0]._id });
+        if (res[0].interval) {
+            await coll.insertOne({
+                ...res[0], executeAfter: moment().add(...res[0].interval).toDate(),
+            });
+        }
         return res[0];
     }
     return null;