Merge pull request #29 from oslabs-beta/james/MongoFix

James/mongo fix

Author: Fredwards

electron/routes/data.ts

@@ -136,6 +136,7 @@ ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: stri
     if (currentDatabaseType === 'MongoDB') {
       result = await mongoFetch(service);
     }
+    
 
     // SQL Database
     if (currentDatabaseType === 'SQL') {
@@ -225,7 +226,7 @@ ipcMain.on('kafkaRequest', async (message) => {
     console.log("in kafkaRequest electron!!")
     // Mongo Database
     if (currentDatabaseType === 'MongoDB') {
-
+      result = await mongoFetch('kafkametrics');
     }
     // SQL Database
     if (currentDatabaseType === 'SQL') {

electron/routes/dataHelpers.js

@@ -13,10 +13,12 @@ const aggregator = [
       output: {
         rowNumber: {
           $documentNumber: {},
-          window: ['unbounded', 'current'],
+          // window: ['unbounded', 'current'],
         },
       },
     },
+  },
+  {
     $match: {
       rowNumber: { $lte: 50 },
     },
@@ -27,10 +29,14 @@ const aggregator = [
 // Create an aggregator based on the aggregator variable
 // return the result
 fetchData.mongoFetch = async function (serviceName) {
-  const testModel = HealthModelFunc(serviceName);
-  let result = await testModel.aggregate(aggregator);
-  result = [{ [serviceName]: result }];
-  return result;
+  try {
+    const testModel = HealthModelFunc(serviceName);
+    let result = await testModel.aggregate(aggregator);
+    result = [{ [serviceName]: result }];
+    return result;
+  } catch (error) {
+    console.log('Aggregation error in mongoFetch(): ', error);
+  }
 };
 
 fetchData.postgresFetch = async function (serviceName, pool) {
@@ -53,12 +59,11 @@ fetchData.postgresFetch = async function (serviceName, pool) {
   ;`;
 
   let result = await pool.query(query);
-  console.log("result.rows in dataHelpers postgresFetch:", JSON.stringify(result.rows));
+  console.log('result.rows in dataHelpers postgresFetch:', JSON.stringify(result.rows));
   result = result.rows;
   result = [{ [serviceName]: result }];
-  console.log("result with servicename in dataHelpers postgresFetch:", JSON.stringify(result));
+  console.log('result with servicename in dataHelpers postgresFetch:', JSON.stringify(result));
   return result;
 };
 
 export { fetchData };
-