core: fix nLiked (#1128)

Author: undefined-moe

framework/framework/package.json

@@ -15,7 +15,7 @@
         "fs-extra": "^11.3.3",
         "koa": "^3.1.1",
         "koa-body": "^7.0.1",
-        "koa-compress": "^5.2.0",
+        "koa-compress": "5.1.1",
         "path-to-regexp": "^8.3.0",
         "sanitize-filename": "^1.6.3",
         "schemastery": "^3.17.2",

packages/hydrooj/src/loader.ts

@@ -127,10 +127,8 @@ export class Loader extends Service {
             fork ? 'update' : 'apply', displayPath, configScope,
         );
         if (fork) {
-            console.log('update fork', fork, config);
             fork.update(config, true);
         } else {
-            console.log('apply plugin', plugin, config);
             fork = this.ctx.plugin(plugin, config);
             if (!fork) return;
             const inner = Object.getPrototypeOf(fork) !== Fiber.prototype
@@ -142,7 +140,6 @@ export class Loader extends Service {
                 if (!fork.uid || !this.state[key]) return;
                 const resolved = await this.resolveConfig(plugin, configScope, false);
                 if (isEqual(this.state[key].config, resolved)) return;
-                console.log('trigger reload', key, configScope);
                 this.reloadPlugin(key, configScope);
             });
         }

packages/hydrooj/src/model/setting.ts

@@ -287,7 +287,7 @@ DomainUserSetting(Schema.object({
 
     rpInfo: Schema.any().extra('family', 'setting_storage').disabled().hidden(),
 
-    ...Object.fromEntries(['nAccept', 'nSubmit', 'nLike', 'rp', 'rpdelta', 'rank', 'level', 'join'].map((i) => ([
+    ...Object.fromEntries(['nAccept', 'nSubmit', 'nLiked', 'rp', 'rpdelta', 'rank', 'level', 'join'].map((i) => ([
         i, Schema.number().default(0).extra('family', 'setting_storage').disabled().hidden(),
     ]))),
 

packages/hydrooj/src/script/problemStat.ts

@@ -7,6 +7,27 @@ import db from '../service/db';
 const sumStatus = (status) => ({ $sum: { $cond: [{ $eq: ['$status', status] }, 1, 0] } });
 
 export async function udoc(report) {
+    const userStats = new Map<string, { nLiked?: number, nAccept?: number, nSubmit?: number }>();
+
+    report({ message: 'Udoc nLiked' });
+    const likedPipeline = [
+        {
+            $match: {
+                docType: document.TYPE_PROBLEM_SOLUTION,
+                vote: { $gt: 0 },
+            },
+        },
+        {
+            $group: {
+                _id: { domainId: '$domainId', uid: '$owner' },
+                nLiked: { $sum: '$vote' },
+            },
+        },
+    ];
+    for await (const adoc of document.coll.aggregate<any>(likedPipeline, { allowDiskUse: true })) {
+        userStats.set(`${adoc._id.domainId}/${adoc._id.uid}`, { nLiked: adoc.nLiked });
+    }
+
     report({ message: 'Udoc' });
     const pipeline = [
         {
@@ -31,20 +52,26 @@ export async function udoc(report) {
             },
         },
     ];
+    for await (const adoc of db.collection('record').aggregate<any>(pipeline, { allowDiskUse: true })) {
+        const key = `${adoc._id.domainId}/${adoc._id.uid}`;
+        const stat = userStats.get(key) || {};
+        stat.nSubmit = adoc.nSubmit;
+        stat.nAccept = adoc.nAccept;
+        userStats.set(key, stat);
+    }
+
     let bulk = db.collection('domain.user').initializeUnorderedBulkOp();
-    const cursor = db.collection('record').aggregate<any>(pipeline, { allowDiskUse: true });
-    for await (const adoc of cursor) {
-        bulk.find({
-            domainId: adoc._id.domainId,
-            uid: adoc._id.uid,
-        }).updateOne({
+    for (const [key, stat] of userStats) {
+        const [domainId, uid] = key.split('/');
+        bulk.find({ domainId, uid: +uid }).updateOne({
             $set: {
-                nSubmit: adoc.nSubmit,
-                nAccept: adoc.nAccept,
+                nSubmit: stat.nSubmit || 0,
+                nAccept: stat.nAccept || 0,
+                nLiked: stat.nLiked || 0,
             },
         });
         if (bulk.batches.length > 100) {
-            await bulk.execute();
+            await bulk.execute(); // eslint-disable-line no-await-in-loop
             bulk = db.collection('domain.user').initializeUnorderedBulkOp();
         }
     }

packages/ui-default/templates/user_detail.html

@@ -153,7 +153,7 @@ <h1 class="section__tab-title">{{ _('Accepted Problems') }}</h1>
           </div>
           <div class="balancer__body">
             <div class="numbox">
-              <div class="numbox__num medium">{{ udoc.nLike or 0 }}</div>
+              <div class="numbox__num medium">{{ udoc.nLiked or 0 }}</div>
               <div class="numbox__text">{{ _('Solutions Liked') }}</div>
             </div>
           </div>