refactor: update mongodb to new version

LCE-Lab · Apr 9, 2024 · 93b7891 · 93b7891
1 parent 9a297e0
commit 93b7891
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/dist/Core/MongoDB.js b/dist/Core/MongoDB.js
diff --git a/dist/Core/SetManager.js b/dist/Core/SetManager.js
diff --git a/dist/Core/TimeManager.js b/dist/Core/TimeManager.js
diff --git a/src/Core/MongoDB.ts b/src/Core/MongoDB.ts
@@ -19,7 +19,9 @@ export class MongoDB extends EventEmitter {
 
         const dbConfig = config.database;
 
-        MongoClient.connect(dbConfig.host, { useNewUrlParser: true, useUnifiedTopology: true }).then(client => {
+        const client = new MongoClient(dbConfig.host);
+
+        client.connect().then(() => {
             console.log('[MongoDB] Connected successfully to server');
 
             this.client = client.db(dbConfig.name);

diff --git a/src/Core/SetManager.ts b/src/Core/SetManager.ts
@@ -1,9 +1,9 @@
-import { Collection, ObjectID } from 'mongodb';
+import { Collection, ObjectId } from 'mongodb';
 import { Core } from '..';
 import { ERR_DB_NOT_INIT } from './MongoDB';
 
 export interface ISet {
-    _id: ObjectID;
+    _id: ObjectId;
     serverID: string;
     settings: {
         rankChannelID: string;
@@ -28,15 +28,17 @@ export class SetManager {
     public async create(serverID: string, rankChannelID: string = '', rankDisplay: boolean = false, continuousChannelID: string = '', continuousDisplay: boolean = false) {
         if (!this.database) throw ERR_DB_NOT_INIT;
 
-        return (await this.database.insertOne({
+        const data = {
             serverID,
             settings: {
                 rankChannelID,
                 rankDisplay,
                 continuousChannelID,
                 continuousDisplay
             }
-        } as ISet)).ops[0] as ISet;
+        } as ISet;
+
+        return (await this.database.insertOne(data)).acknowledged ? data : null;
     }
 
     public async get(serverID: string) {
@@ -66,6 +68,6 @@ export class SetManager {
             { serverID },
             set,
             { upsert: true }
-        )).value;
+        ));
     }
 }
diff --git a/src/Core/TimeManager.ts b/src/Core/TimeManager.ts
@@ -1,9 +1,9 @@
-import { Collection, ObjectID } from 'mongodb';
+import { Collection, ObjectId } from 'mongodb';
 import { Core } from '..';
 import { ERR_DB_NOT_INIT } from './MongoDB';
 
 export interface ITime {
-    _id: ObjectID;
+    _id: ObjectId;
     serverID: string;
     userID: string;
     timeStamp: number;
@@ -25,12 +25,14 @@ export class TimeManager {
     public async create(serverID: string, userID: string, timeStamp: number, type: string) {
         if (!this.database) throw ERR_DB_NOT_INIT;
 
-        return (await this.database.insertOne({
+        const data = {
             serverID,
             userID,
             timeStamp,
             type
-        } as ITime)).ops[0] as ITime;
+        } as ITime;
+
+        return (await this.database.insertOne(data)).acknowledged ? data : null;
     }
 
     public async get(serverID: string, startTime: number, endTime: number) {
@@ -60,6 +62,6 @@ export class TimeManager {
     public async getCountByUserAndType(serverID: string, userID: string, startTime: number, endTime: number, type: string) {
         if (!this.database) throw ERR_DB_NOT_INIT;
 
-        return this.database.find({ serverID, userID, timeStamp: { $gte: startTime, $lt: endTime }, type }).count();
+        return this.database.countDocuments({ serverID, userID, timeStamp: { $gte: startTime, $lt: endTime }, type });
     }
 }