Merge pull request #25 from oslabs-beta/james/electron-main-refactor

James/electron main refactor

Author: alexkolb1

chronos_npm_package/controllers/mongo.js

@@ -218,6 +218,14 @@ It then takes the returned array of metrics, turns them into documents based on
 KafkaModel.js, and inserts them into the db at the provided uri with insertMany()
 */
 chronos.kafka = function (userConfig) {
+  // ensure that kafkametrics exists in the services table
+  const service = new ServicesModel({ service: 'kafkametrics', interval: userConfig.interval });
+
+  service
+    .save()
+    .then(() => console.log(`Adding "kafkametrics" to the services table`))
+    .catch(err => console.log(`Error saving "kafkametrics" to the services table: `, err.message));
+
   // fetch the data from Kafka with kafkaFetch()
   // then take turn each result in the returned array into a kafkaModel doc
   // insertMany into the the KafkaModel

chronos_npm_package/controllers/postgres.js

@@ -298,6 +298,8 @@ chronos.docker = function ({ microservice, interval }) {
 };
 
 chronos.kafka = function (userConfig) {
+  // Ensure that kafkametrics are a part of the services table
+  chronos.services({ microservice: 'kafkametrics', interval: userConfig.interval });
   // create kafkametrics table if it does not exist
   const createTableQuery = `
     CREATE TABLE IF NOT EXISTS kafkametrics (

electron/routes/data.ts

@@ -12,10 +12,11 @@ import DockerModelFunc from '../models/DockerModel';
 import KafkaModel from '../models/KafkaModel';
 import fetch, { FetchError } from 'electron-fetch';
 import { lightWhite } from 'material-ui/styles/colors';
-import {fetchData}  from './dataHelpers';
+//import { postgresFetch, mongoFetch }  from './dataHelpers';
+import { fetchData } from './dataHelpers';
 
-const postgresFetch = fetchData.postgresFetch;
 const mongoFetch = fetchData.mongoFetch;
+const postgresFetch = fetchData.postgresFetch;
 
 require('dotenv').config();
 console.log('test console log work');
@@ -132,48 +133,12 @@ ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: stri
 
     // Mongo Database
     if (currentDatabaseType === 'MongoDB') {
-      // // Get document count
-      let num = await HealthModelFunc(service).countDocuments({});
-      // Get last 50 documents. If less than 50 documents, get all
-      num = Math.max(num, 10);
-      result = await HealthModelFunc(service)
-        .find(
-          {},
-          {
-            cpuspeed: 1,
-            cputemp: 1,
-            cpuloadpercent: 1,
-            totalmemory: 1,
-            freememory: 1,
-            usedmemory: 1,
-            activememory: 1,
-            totalprocesses: 1,
-            runningprocesses: 1,
-            blockedprocesses: 1,
-            sleepingprocesses: 1,
-            latency: 1,
-            time: 1,
-            __v: 1,
-            service,
-          }
-        )
-        .skip(num - 50);
-
+      result = await mongoFetch(service);
     }
 
-    /**
-     * `
-          SELECT *, 'customers' as service FROM customers
-          ORDER BY _id DESC
-          LIMIT 50
-          `;
-     * 
-     */
-
     // SQL Database
     if (currentDatabaseType === 'SQL') {
       // Get last 50 documents. If less than 50 get all
- 
       result = await postgresFetch(service, pool);
       console.log("result-health in data.ts:", JSON.stringify(result));
     }

electron/routes/dataHelpers.js

@@ -26,8 +26,11 @@ const aggregator = [
 // TCreate a model based on the serviceName
 // Create an aggregator based on the aggregator variable
 // return the result
-fetchData.mongoFetch = function (serviceName) {
-  
+fetchData.mongoFetch = async function (serviceName) {
+  const testModel = HealthModelFunc(serviceName);
+  let result = await testModel.aggregate(aggregator);
+  result = [{ [serviceName]: result }];
+  return result;
 };
 
 fetchData.postgresFetch = async function (serviceName, pool) {
@@ -57,4 +60,5 @@ fetchData.postgresFetch = async function (serviceName, pool) {
   return result;
 };
 
-export {fetchData};
+export { fetchData };
+