feat(teach): implement getStats by aggregation api

koishijs · Aug 22, 2021 · 8dafcc1 · 8dafcc1
1 parent fa6b7d4
commit 8dafcc1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/packages/plugin-teach/src/database/mongo.ts b/packages/plugin-teach/src/database/mongo.ts
@@ -39,18 +39,6 @@ Database.extend('koishi-plugin-mongo', {
     }
     await this.update('dialogue', data)
   },
-
-  async getDialogueStats() {
-    const [data, dialogues] = await Promise.all([
-      this.db.collection('dialogue').aggregate([
-        { $group: { _id: null, questions: { $addToSet: '$question' } } },
-        { $project: { questions: { $size: '$questions' } } },
-      ]).toArray(),
-      this.db.collection('dialogue').countDocuments(),
-    ])
-    const { questions } = data[0]
-    return { questions, dialogues }
-  },
 })
 
 export default function apply(ctx: Context) {

diff --git a/packages/plugin-teach/src/database/mysql.ts b/packages/plugin-teach/src/database/mysql.ts
@@ -43,14 +43,6 @@ Database.extend('koishi-plugin-mysql', {
     }
     await this.update('dialogue', data)
   },
-
-  async getDialogueStats() {
-    const [{
-      'COUNT(DISTINCT `question`)': questions,
-      'COUNT(*)': dialogues,
-    }] = await this.query<any>('SELECT COUNT(DISTINCT `question`), COUNT(*) FROM `dialogue`')
-    return { questions, dialogues }
-  },
 })
 
 export default function apply(ctx: Context) {

diff --git a/packages/plugin-teach/src/index.ts b/packages/plugin-teach/src/index.ts
@@ -223,7 +223,7 @@ export function apply(ctx: Context, config: Config = {}) {
       stats.upload()
     })
 
-    meta.extend(() => ctx.database.getDialogueStats())
+    meta.extend(() => Dialogue.getStats(ctx))
 
     stats.extend(async (payload, data) => {
       const dialogueMap = stats.average(data.daily.map(data => data.dialogue))

diff --git a/packages/plugin-teach/src/search.ts b/packages/plugin-teach/src/search.ts
@@ -42,7 +42,7 @@ export default function apply(ctx: Context) {
   })
 
   ctx.on('dialogue/status', async () => {
-    const { questions, dialogues } = await ctx.database.getDialogueStats()
+    const { questions, dialogues } = await Dialogue.getStats(ctx)
     return `共收录了 ${questions} 个问题和 ${dialogues} 个回答。`
   })
 

diff --git a/packages/plugin-teach/src/utils.ts b/packages/plugin-teach/src/utils.ts
@@ -19,7 +19,6 @@ declare module 'koishi-core' {
   interface Database {
     getDialoguesByTest(test: DialogueTest): Promise<Dialogue[]>
     updateDialogues(dialogues: Observed<Dialogue>[], argv: Dialogue.Argv): Promise<void>
-    getDialogueStats(): Promise<Dialogue.Stats>
   }
 }
 
@@ -110,6 +109,13 @@ export namespace Dialogue {
     complement = 16,
   }
 
+  export async function getStats(ctx: Context): Promise<Stats> {
+    return ctx.database.aggregate('dialogue', {
+      dialogues: { $count: 'id' },
+      questions: { $count: 'question' },
+    })
+  }
+
   export async function get<K extends Dialogue.Field>(ctx: Context, ids: number[], fields?: K[]) {
     const dialogues = await ctx.database.get('dialogue', ids, fields)
     dialogues.forEach(d => defineProperty(d, '_backup', clone(d)))

diff --git a/packages/plugin-teach/tests/environment.ts b/packages/plugin-teach/tests/environment.ts
@@ -35,12 +35,6 @@ Database.extend('koishi-test-utils', {
     }
     await this.update('dialogue', data)
   },
-
-  async getDialogueStats() {
-    const dialogues = this.$count('dialogue')
-    const questions = this.$count('dialogue', 'question')
-    return { questions, dialogues }
-  },
 })
 
 export function memory(ctx: Context) {