Fixing ES vs CommonJS module issues

Author: apinkhasov101

chronos_npm_package/controllers/mongo.js

@@ -1,17 +1,18 @@
-const mongoose = require('mongoose');
-const alert = require('./alert.js');
-const CommunicationModel = require('../models/CommunicationModel');
-const ServicesModel = require('../models/ServicesModel');
-const HealthModelFunc = require('../models/HealthModel');
-const ContainerInfoFunc = require('../models/ContainerInfo');
-const KafkaModel = require('../models/KafkaModel');
-const KubernetesModel = require('../models/KubernetesModel.js');
-const { collectHealthData } = require('./healthHelpers.js');
-const MetricsModel = require('../models/MetricsModel');
-const dockerHelper = require('./dockerHelper');
-const utilities = require('./utilities');
-require('../models/ContainerInfo');
-const GrafanaAPIKeyModel = require('../models/GrafanaAPIKeyModel');
+import mongoose from 'mongoose';
+import alert from './alert.js';
+import CommunicationModel from '../models/CommunicationModel.ts';
+// const ServicesModel = require('../models/ServicesModel.ts');
+import ServicesModel from '../models/ServicesModel.ts';
+import HealthModelFunc from'../models/HealthModel.ts';
+import ContainerInfoFunc from'../models/ContainerInfo.ts';
+import KafkaModel  from'../models/KafkaModel.ts';
+import KubernetesModel from'../models/KubernetesModel.ts';
+import { collectHealthData } from'./healthHelpers.js';
+import MetricsModel from '../models/MetricsModel.ts';
+import dockerHelper from './dockerHelper';
+import utilities from './utilities';
+// require('../models/ContainerInfo');
+import GrafanaAPIKeyModel from '../models/GrafanaAPIKeyModel.ts';
 
 mongoose.set('strictQuery', true);
 

chronos_npm_package/models/CommunicationModel.ts

@@ -37,4 +37,10 @@ const CommunicationsSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('communications', CommunicationsSchema);
+// module.exports = mongoose.model('communications', CommunicationsSchema); //invalid format for TS
+
+// Define the model
+const CommunicationModel = mongoose.model('communications', CommunicationsSchema);
+
+// Export the model
+export default CommunicationModel;

chronos_npm_package/models/ContainerInfo.ts

@@ -19,7 +19,12 @@ const DockerSchema = new Schema({
   },
 });
 
-module.exports = ContainerName => {
-  console.log('Inside Docker Schema ContainerInfo.js LN52', ContainerName)
-  return mongoose.model(ContainerName, DockerSchema);
-};
+// module.exports = ContainerName => {
+//   console.log('Inside Docker Schema ContainerInfo.js LN52', ContainerName)
+//   return mongoose.model(ContainerName, DockerSchema); 
+// }; // invalid format for TS files
+
+const ContainerName = mongoose.model('ContainerName', DockerSchema);
+
+// Export the model
+export default ContainerName;

chronos_npm_package/models/GrafanaAPIKeyModel.ts

@@ -9,4 +9,9 @@ const GrafanaAPIKeySchema = new Schema({
     }
 });
 
-module.exports = mongoose.model('grafanaAPI', GrafanaAPIKeySchema);
+// module.exports = mongoose.model('grafanaAPI', GrafanaAPIKeySchema);
+
+const GrafanaAPIKeyModel = mongoose.model('GrafanaAPIKeyModel', GrafanaAPIKeySchema);
+
+// Export the model
+export default GrafanaAPIKeyModel;

chronos_npm_package/models/HealthModel.ts

@@ -18,4 +18,8 @@ const HealthSchema = new Schema({
     default: '',
   },
 });
-module.exports = MicroSrvName => mongoose.model(MicroSrvName, HealthSchema);
+// module.exports = MicroSrvName => mongoose.model(MicroSrvName, HealthSchema); // invalid format of export for TS files
+const MicroSrvName = mongoose.model('MicroSrvName', HealthSchema);
+
+// Export the model
+export default MicroSrvName;

chronos_npm_package/models/KafkaModel.ts

@@ -19,4 +19,9 @@ const KafkaSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('kafkametrics', KafkaSchema);
+// module.exports = mongoose.model('kafkametrics', KafkaSchema); // invalid format for TS files
+
+const KafkaModel = mongoose.model('KafkaModel', KafkaSchema);
+
+// Export the model
+export default KafkaModel;

chronos_npm_package/models/KubernetesModel.ts

@@ -19,4 +19,12 @@ const KubernetesSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('kubernetesmetrics', KubernetesSchema);
+// module.exports = mongoose.model('kubernetesmetrics', KubernetesSchema);  // invalid format for TS files
+
+
+
+
+const KubernetesModel = mongoose.model('KubernetesModel', KubernetesSchema);
+
+// Export the model
+export default KubernetesModel;

chronos_npm_package/models/MetricsModel.ts

@@ -19,4 +19,10 @@ const MetricsSchema = new Schema({
   }
 });
 
-module.exports = mongoose.model('metrics', MetricsSchema);
+// module.exports = mongoose.model('metrics', MetricsSchema);
+
+
+const MetricsModel = mongoose.model('MetricsModel', MetricsSchema);
+
+// Export the model
+export default MetricsModel;

chronos_npm_package/models/ServicesModel.ts

@@ -13,4 +13,10 @@ const ServicesSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('services', ServicesSchema);
+// module.exports = mongoose.model('services', ServicesSchema); // invalid format when converted to TS
+
+// Define the model
+const ServicesModel = mongoose.model('services', ServicesSchema);
+
+// Export the model
+export default ServicesModel;

chronos_npm_package/models/gRPC_CommunicationModel.ts

@@ -33,3 +33,5 @@ const gRPC_CommunicationsSchema = new Schema({
 });
 
 module.exports = mongoose.model('grpc_communications', gRPC_CommunicationsSchema);
+
+