From dc1b190b5f1de83c8b896b09d0b6ab75f3a1d230 Mon Sep 17 00:00:00 2001
From: Luke Berndt <lukekb@gmail.com>
Date: Tue, 11 Apr 2023 20:20:30 -0400
Subject: [PATCH] trying an earlier version

---
 backend/controllers/groups.js     | 9 ++++++++-
 backend/controllers/talkgroups.js | 8 +++++++-
 backend/index.js                  | 5 -----
 backend/package.json              | 2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/backend/controllers/groups.js b/backend/controllers/groups.js
index 8db33e6..55ec498 100644
--- a/backend/controllers/groups.js
+++ b/backend/controllers/groups.js
@@ -1,8 +1,15 @@
 const Group = require("../models/group");
 
 exports.get_groups = async function (req, res) {
-    const grp_results = await Group.find({ shortName: req.params.shortName.toLowerCase()}).sort("position").exec();
+    process.nextTick(async function () {
+    const grp_results = await Group.find({ shortName: req.params.shortName.toLowerCase()}).sort("position").catch(err => {
+        console.error(err);
+        res.status(500);
+        res.json({ success: false, message: err });
+        return;
+      });
 
     res.contentType('json');
     res.send(JSON.stringify(grp_results));
+    });
 }
diff --git a/backend/controllers/talkgroups.js b/backend/controllers/talkgroups.js
index c5475f5..81d78af 100644
--- a/backend/controllers/talkgroups.js
+++ b/backend/controllers/talkgroups.js
@@ -1,7 +1,13 @@
 const Talkgroup = require("../models/talkgroup");
 
 exports.get_talkgroups = async function (req, res) {
-    const tg_results = await Talkgroup.find({ 'shortName': req.params.shortName.toLowerCase()})
+    const tg_results = await Talkgroup.find({ 'shortName': req.params.shortName.toLowerCase()}).catch(err => {
+        console.error(err);
+        res.status(500);
+        res.json({ success: false, message: err });
+        return;
+      });
+      
     var talkgroups = {};
     for (var tg in tg_results) {
         talkgroups[tg_results[tg].num] = tg_results[tg];
diff --git a/backend/index.js b/backend/index.js
index 8c53c9f..6b4381c 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -51,19 +51,14 @@ const connect = async () => {
     console.log(mongoose.connection.readyState); //logs 0
     mongoose.connection.on('connecting', () => {
       console.log('Mongoose is connecting')
-      console.log(mongoose.connection.readyState); //logs 2
     });
     mongoose.connection.on('connected', () => {
       console.log('Mongoose is connected');
-      console.log(mongoose.connection.readyState); //logs 1
     });
     mongoose.connection.on('disconnecting', () => {
       console.log('Mongoose is disconnecting');
-      console.log(mongoose.connection.readyState); // logs 3
     });
   
-    // Connect to a MongoDB server running on 'localhost:27017' and use the
-    // 'test' database.
     await mongoose.connect(mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true });
     console.log("All Done");
 }
diff --git a/backend/package.json b/backend/package.json
index cb0ed81..0832f11 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -24,7 +24,7 @@
     "get-folder-size": "^4.0.0",
     "mkdirp": "^2.1.6",
     "mongodb": "5.2.0",
-    "mongoose": "7.0.3",
+    "mongoose": "7.0.0",
     "multer": "1.3.0",
     "node-ffprobe": "https://github.com/ListenerApproved/node-ffprobe",
     "node-schedule": "2.1.1",