From dc8c13cf9f83d5ea081cc3c380364c38c86d6fc1 Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Sun, 29 Oct 2023 12:02:48 -0700
Subject: [PATCH] fix/BSONError: cyclic dependency detected

---
 admin/migrate_playerstats.js |  2 +-
 commands/leaderboard.js      | 20 ++++----------------
 commands/player-stats.js     | 17 ++++-------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/admin/migrate_playerstats.js b/admin/migrate_playerstats.js
index 1f157f0..c562a77 100644
--- a/admin/migrate_playerstats.js
+++ b/admin/migrate_playerstats.js
@@ -48,7 +48,7 @@ async function migrate() {
     const result = await players.insertMany(guild.server.playerstats, { ordered: true });
     console.log(`${result.insertedCount} documents were inserted`);
 
-    delete guild.server.playerstats;
+    // delete guild.server.playerstats;
 
   } catch (err) {
     throw new Error(`An error occured while attempting to migrate player stats: ${err}`)
diff --git a/commands/leaderboard.js b/commands/leaderboard.js
index 7063c65..0541cf1 100644
--- a/commands/leaderboard.js
+++ b/commands/leaderboard.js
@@ -55,27 +55,15 @@ module.exports = {
       let leaderboard = [];
       if (category == 'money') {
 
-        const usersCursor = await client.dbo.collection("users").aggregate([
+        leaderboard = await client.dbo.collection("users").aggregate([
           { $sort: { [`user.guilds.${GuildDB.serverID}.balance`]: -1 } }
-        ]);
-
-        let i = 0;
-        for await (const user of usersCursor) {
-          if (i == limit) break;
-          leaderboard.push(user);
-        }
+        ]).toArray();
 
       } else {
         
-        const playersCursor = await client.dbo.collection("players").aggregate([
+        leaderboard = await client.dbo.collection("players").aggregate([
           { $sort: { [`${category}`]: -1 } }
-        ]);
-
-        let i = 0;
-        for await (const player of playersCursor) {
-          if (i == limit) break;
-          leaderboard.push(player);
-        }
+        ]).toArray();
 
       }
       
diff --git a/commands/player-stats.js b/commands/player-stats.js
index 33ce86f..223a9ce 100644
--- a/commands/player-stats.js
+++ b/commands/player-stats.js
@@ -68,14 +68,9 @@ module.exports = {
 
       if (category == 'money') {
 
-        const usersCursor = await client.dbo.collection("users").aggregate([
+        leaderboard = await client.dbo.collection("users").aggregate([
           { $sort: { [`user.guilds.${GuildDB.serverID}.balance`]: -1 } }
-        ]);
-
-        for await (const user of usersCursor) {
-          leaderboard.push(user);
-        }
-
+        ]).toArray();
 
         if (discord) { // If searching by discord
           query = leaderboard.find(u => u.user.userID == discord);
@@ -93,13 +88,9 @@ module.exports = {
 
       } else {
         
-        const playersCursor = await client.dbo.collection("players").aggregate([
+        leaderboard = await client.dbo.collection("players").aggregate([
           { $sort: { [`${category}`]: -1 } }
-        ]);
-
-        for await (const player of playersCursor) {
-          leaderboard.push(player);
-        }
+        ]).toArray();
 
         if (discord) { // If searching by discord
           query = leaderboard.find(s => s.discordID == discord);