From 0bdca1cdb570aa602ab980572e3ea754237faca2 Mon Sep 17 00:00:00 2001
From: Luke Berndt <lukekb@gmail.com>
Date: Tue, 11 Apr 2023 21:35:28 -0400
Subject: [PATCH] different Loop style

---
 backend/controllers/calls.js | 13 +++++++------
 backend/index.js             |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/controllers/calls.js b/backend/controllers/calls.js
index 9ff65e4..a1ca8bd 100644
--- a/backend/controllers/calls.js
+++ b/backend/controllers/calls.js
@@ -25,7 +25,9 @@ async function get_calls(query, numResults, res) {
 
     const sort = { length: -1 };
     try {
-        for await (const item of Call.find(query.filter, fields).sort(sort).limit(numResults)) {
+        const items =  await Call.find(query.filter, fields).sort(sort).limit(numResults);
+        for (var i=0; i < items.length; i++) {
+            const item = items[i];
             call = {
                 _id: item._id.toHexString(),
                 talkgroupNum: item.talkgroupNum,
@@ -40,11 +42,10 @@ async function get_calls(query, numResults, res) {
             calls.push(call);
         }
 
-        res.contentType('json');
-        res.send(JSON.stringify({
+        res.json({
             calls: calls,
             direction: query.direction
-        }));
+        });
     } catch (err) {
         console.warn("Error - get_calls() Could not find item " + err + " filter: " + query.filter);
         res.send(404, 'Sorry, we cannot find that!');
@@ -111,7 +112,7 @@ async function build_filter(filter_type, code, start_time, direction, shortName,
                 return;
             }
 
-            const group = await Group.findOne({ 'shortName': shortName,  '_id': ObjectId.createFromHexString(code)}).exec();
+            const group = await Group.findOne({ 'shortName': shortName, '_id': ObjectId.createFromHexString(code) }).exec();
             if (!group) {
                 console.warn("[" + shortName + "] Error - build_filter() group is null " + err);
                 res.contentType('json');
@@ -173,7 +174,7 @@ exports.get_card = async function (req, res) {
         }));
         return;
     }
-    
+
     const item = await Call.findById(o_id).exec();
 
     //console.log(util.inspect(item));
diff --git a/backend/index.js b/backend/index.js
index 41b5c88..efefa93 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -96,7 +96,7 @@ function addSystemClients(req, res, next) {
 
 
 /*------    CALLS   ----------*/
-/*
+
 app.get('/card/:id', calls.get_card);
 app.post('/add_star/:id', calls.add_star);
 app.post('/remove_star/:id', calls.remove_star);
@@ -106,7 +106,7 @@ app.get('/:shortName/calls/next', calls.get_next_calls);
 app.get('/:shortName/calls/newer', calls.get_newer_calls);
 app.get('/:shortName/calls/older', calls.get_older_calls);
 app.get('/:shortName/calls/:time/older', calls.get_iphone_calls);
-app.get('/:shortName/calls', calls.get_calls); */
+app.get('/:shortName/calls', calls.get_calls); 
 
 
 /*------    UPLOADS   ---------- upload.single('call'),  uploads.upload,*/
@@ -125,9 +125,9 @@ app.get('/:shortName/groups', groups.get_groups);
 
 
 /*------    EVENTS   ----------*/
-/*app.post('/events', events.addNewEvent);
+app.post('/events', events.addNewEvent);
 app.get('/events', events.getEvents);
-app.get('/events/:id', events.getEvent);*/
+app.get('/events/:id', events.getEvent);
 
 /*------    STATS   ----------*/
 //app.get('/:shortName/stats', stats.get_stats);