feat: rewrite deleteLearn.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffinbot",
-  "version": "2.1.0-oreo.b240611a",
+  "version": "2.1.0-oreo.b240618a",
   "main": "dist/index.js",
   "private": true,
   "dependencies": {

src/Commands/deleteLearn.ts

@@ -1,5 +1,5 @@
 import { Message } from 'discord.js'
-import { Command } from '../modules'
+import { Command, type LearnData } from '../modules'
 
 export default class extends Command {
   public constructor() {
@@ -9,21 +9,43 @@ export default class extends Command {
     if (!args[0]) {
       return await msg.channel.send('```머핀아 삭제 (지울 단어)```')
     }
+
     const command = args[0]
     const db = msg.client.chatBot.db
-    const data = await db.learn.findOne(command)
+    const [data] = await db.learn.execute<LearnData[]>(
+      'SELECT * FROM learn WHERE command = ? AND user_id = ?;',
+      [command, msg.author.id],
+    )
+
+    console.log(data)
 
     if (!data[0]) {
       return await msg.channel.send('해당하는 걸 찾ㅈ을 수 없어요.')
     }
 
-    if (data[0].user_id !== msg.author.id) {
+    console.log(data.length)
-      return await msg.channel.send(
+
-        '어라 당ㅅ신은 언제 가르쳐 주셨죠?',
+    if (data.length > 1) {
-      )
+      console.log('a')
+    } else {
+      // await db.learn.delete(command)
+      // await msg.reply('어라 이제 그ㄱ게 기억이 안나요. 뭐ㅇ였죠?')
+      console.log('b')
     }
 
-    await db.learn.delete(command)
+    await msg.reply('현재 이 기능은 재작성 중입니다.')
-    await msg.reply('어라 이제 그ㄱ게 기억이 안나요.')
+
+    //   if (!data[0]) {
+    //     return await msg.channel.send('해당하는 걸 찾ㅈ을 수 없어요.')
+    //   }
+    //
+    //   if (data[0].user_id !== msg.author.id) {
+    //     return await msg.channel.send(
+    //       '어라 당ㅅ신은 언제 가르쳐 주셨죠?',
+    //     )
+    //   }
+    //
+    //   await db.learn.delete(command)
+    //   await msg.reply('어라 이제 그ㄱ게 기억이 안나요.')
   }
 }

src/modules/database/model/learn.ts

@@ -69,4 +69,14 @@ export class LearnTable implements BaseTable<LearnData, string> {
     )
     return rows
   }
+
+  public async execute<W>(sql: string, values?: any): Promise<W> {
+    const db = await this._database.getConnection()
+    let data: any
+
+    await run(db, async () => {
+      data = await db.execute(sql, [...values])
+    })
+    return data
+  }
 }

src/modules/database/model/nsfwContent.ts

@@ -61,4 +61,14 @@ export class NSFWContentTable implements BaseTable<NSFWData, number> {
     )
     return rows
   }
+
+  public async execute<W>(sql: string, values?: any): Promise<W> {
+    const db = await this._database.getConnection()
+    let data: any
+
+    await run(db, async () => {
+      data = await db.execute(sql, [...values])
+    })
+    return data
+  }
 }

src/modules/database/model/statement.ts

@@ -73,4 +73,14 @@ export class StatementTable implements BaseTable<ResponseData, number> {
     )
     return rows
   }
+
+  public async execute<W>(sql: string, values?: any): Promise<W> {
+    const db = await this._database.getConnection()
+    let data: any
+
+    await run(db, async () => {
+      data = await db.execute(sql, [...values])
+    })
+    return data
+  }
 }

src/modules/database/run.ts

@@ -1,6 +1,6 @@
 import { type PoolConnection } from 'mysql2/promise'
 
-export default async function run(db: PoolConnection, fn: () => Promise<void>) {
+export default async function run(db: PoolConnection, fn: () => Promise<any>) {
   try {
     await db.beginTransaction()
     await fn()

src/modules/database/type.ts

@@ -33,4 +33,5 @@ export interface BaseTable<T, V> {
   update(data: any): Promise<void>
   delete(key: V): Promise<void>
   findOneAnotherKey(key: string, data: any): Promise<T[]>
+  execute<W>(sql: string, values?: any): Promise<W>
 }