core: fix problem copy pid

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",

packages/hydrooj/src/handler/problem.ts

@@ -292,13 +292,12 @@ export class ProblemDetailHandler extends ProblemHandler {
     }
 
     @param('target', Types.String)
-    @param('pid', Types.String, true)
+    async postCopy(domainId: string, target: string) {
-    async postCopy(domainId: string, target: string, pid: string) {
         const ddoc = await domain.get(target);
         if (!ddoc) throw new NotFoundError(target);
         const dudoc = await user.getById(target, this.user._id);
         if (!dudoc.hasPerm(PERM.PERM_CREATE_PROBLEM)) throw new PermissionError(PERM.PERM_CREATE_PROBLEM);
-        const docId = await problem.copy(domainId, this.user.docId, target, pid);
+        const docId = await problem.copy(domainId, this.user.docId, target, this.pdoc.pid);
         this.response.redirect = this.url('problem_detail', { domainId: target, pid: docId });
     }
 

packages/hydrooj/src/model/problem.ts

@@ -147,7 +147,7 @@ export class ProblemModel {
     static async copy(domainId: string, _id: number, target: string, pid?: string) {
         const original = await ProblemModel.get(domainId, _id);
         if (!original) throw new ProblemNotFoundError(domainId, _id);
-        if (pid && await ProblemModel.get(target, pid)) pid = '';
+        if (pid && (/^[0-9]+$/.test(pid) || await ProblemModel.get(target, pid))) pid = '';
         if (!pid && original.pid && !await ProblemModel.get(target, original.pid)) pid = original.pid;
         const docId = await ProblemModel.add(
             target, pid, original.title, original.content,

packages/hydrooj/src/upgrade.ts

@@ -588,7 +588,7 @@ const scripts: UpgradeScript[] = [
                         pids.push(pdoc.docId);
                         await RecordModel.updateMulti(
                             doc.domainId,
-                            { contest: doc.docId },
+                            { contest: doc.docId, pid },
                             { pid: pdoc.docId },
                             {},
                             { pdomain: '' },
@@ -627,6 +627,22 @@ const scripts: UpgradeScript[] = [
         await db.collection('record').updateMany({}, { $unset: { pdomain: '' } });
         return true;
     },
+    async function _52_53() {
+        const _FRESH_INSTALL_IGNORE = 1;
+        const cursor = db.collection('document').find({ docType: document.TYPE_CONTEST });
+        while (await cursor.hasNext()) {
+            const tdoc = await cursor.next();
+            const pdocs = await problem.getMulti(tdoc.domainId, { docId: { $in: tdoc.pids } }).toArray();
+            if (!pdocs.filter((i) => i.reference).length) continue;
+            const tsdocs = await contest.getMultiStatus(tdoc.domainId, { docId: tdoc.docId }).toArray();
+            for (const tsdoc of tsdocs) {
+                for (const tsrdoc of tsdoc.journal) {
+                    await RecordModel.coll.updateOne({ _id: tsrdoc.rid }, { pid: tsrdoc.pid });
+                }
+            }
+        }
+        return true;
+    },
 ];
 
 export default scripts;