@sedni/cloud_common 1.0.0 → 1.0.1

package/app/models/ChannelDataBucket.js

@@ -191,7 +191,7 @@ channeldataBucketSchema.statics.lastTimeSynced = async function(options)
 channeldataBucketSchema.statics.getNotUploadedData = async function(options)
 {
     // Get the last time the data was synced
-    let last_sync = options?.last_sync ?? await this.lastTimeSynced(options);
+    const last_sync = options?.last_sync ?? await this.lastTimeSynced(options);
 
     // Get all the buckets that synced is lt size and end_date is gt last_sync
     const buckets = await this.find({  

package/app/models/Event.js

@@ -1,7 +1,7 @@
 const mongoose = require("mongoose");
 const mongoose_paginate = require("mongoose-paginate-v2");
 const mongoose_aggregate_paginate = require("mongoose-aggregate-paginate-v2");
-const { EventCategories } = require("app/types/event.types");
+const { EventCategories } = require("../types/event.types");
 
 const eventSchema = new mongoose.Schema({
     event_message: {
@@ -59,12 +59,12 @@ const eventSchema = new mongoose.Schema({
 /**
  * Index used primarily for filtering by channel_tag 
  */
-historySchema.index({ "channel_tag" : 1 });
+eventSchema.index({ "channel_tag" : 1 });
 
 /**
  * Index used primarily for filtering by timestamp 
  */
-historySchema.index({ "timestamp" : 1 });
+eventSchema.index({ "timestamp" : 1 });
 
 
 /**
@@ -72,7 +72,7 @@ historySchema.index({ "timestamp" : 1 });
  * /////////////     PLUGINS     /////////////////
  * ///////////////////////////////////////////////
  */
-historySchema.plugin(mongoose_paginate);
-historySchema.plugin(mongoose_aggregate_paginate);
+eventSchema.plugin(mongoose_paginate);
+eventSchema.plugin(mongoose_aggregate_paginate);
 
 module.exports = eventSchema;

package/app/models/History.js

@@ -1,7 +1,7 @@
 const mongoose = require("mongoose");
 const mongoose_paginate = require("mongoose-paginate-v2");
 const mongoose_aggregate_paginate = require("mongoose-aggregate-paginate-v2");
-const { AlarmTypes, AlarmPriorities, AlarmStates, DiamarAlarmStates } = require("@types/alarm.types");
+const { AlarmTypes, AlarmPriorities, CloudAlarmStates, DiamarAlarmStates } = require("../types/alarm.types");
 
 const historySchema = new mongoose.Schema({
     timestamp: {
@@ -26,7 +26,7 @@ const historySchema = new mongoose.Schema({
     alarm_state: {
         type: String,
         required: true,
-        enum: Object.values(AlarmStates),
+        enum: Object.values(CloudAlarmStates),
     },
     alarm_type: {
         type: String,

package/app/types/alarm.types.js

@@ -3,7 +3,7 @@ const AlarmPriorities =
     CRITICAL:   "Critical",
     ALARM:      "Alarm",
     WARNING:    "Warning",
-}
+};
 
 const DiamarAlarmStates =
 {
@@ -40,7 +40,7 @@ const AlarmTypes =
     ALARM_FAIL:     "AlarmFail",
     ALARM_INH:      "AlarmInh",
     ALARM_UNK:      "AlarmUnk",
-}
+};
 
 module.exports =
 {

package/eslint.config.js

@@ -0,0 +1,38 @@
+const globals = require("globals");
+const pluginJs = require("@eslint/js");
+const nodePlugin = require("eslint-plugin-n");
+
+module.exports = [
+    pluginJs.configs.recommended,
+    nodePlugin.configs["flat/recommended-script"],
+    {
+        files: ["app/**/*.js", "app/**/*.json", "index.js"],
+        languageOptions: {
+            "ecmaVersion": "latest",
+            "sourceType": "commonjs",
+            "globals": globals.node,
+        },
+        rules: {
+            "prefer-const": ["error"],
+            "no-var": ["error"],
+            "semi": ["error", "always"],
+            "indent": ["error", 4],
+            "quotes": ["error", "double"],
+            "no-unused-vars": [
+                "error",
+                {
+                    "varsIgnorePattern": "should|expect|supertest|assert",
+                },
+            ],
+            "curly": ["error", "all"],
+            "brace-style": ["error", "allman"],
+            "n/no-missing-require" : "off",
+            "n/no-unpublished-require": [
+                "error",
+                {
+                    "allowModules": ["swagger-ui-express"],
+                },
+            ],
+        }
+    },
+];

package/index.js

@@ -1,11 +1,11 @@
 /**
  * SCHEMAS
  */
-const Channel = require("app/models/channel");
-const ChannelDataBucket = require("app/models/channelDataBucket");
-const Event = require("app/models/event");
-const History = require("app/models/history");
-const Unit = require("app/models/unit");
+const Channel = require("./app/models/Channel");
+const ChannelDataBucket = require("./app/models/ChannelDataBucket.js");
+const Event = require("./app/models/Event.js");
+const History = require("./app/models/History.js");
+const Unit = require("./app/models/Unit.js");
 
 const Schemas = {
     Channel,
@@ -18,11 +18,11 @@ const Schemas = {
 /**
  * DOCS
  */
-const ChannelDocs = require("app/models/docs/channel.docs");
-const ChannelDataBucketDocs = require("app/models/docs/channelDataBucket.docs");
-const EventDocs = require("app/models/docs/event.docs");
-const HistoryDocs = require("app/models/docs/history.docs");
-const UnitDocs = require("app/models/docs/unit.docs");
+const ChannelDocs = require("./app/models/docs/Channel.json");
+const ChannelDataBucketDocs = require("./app/models/docs/ChannelDataBucket.json");
+const EventDocs = require("./app/models/docs/Event.json");
+const HistoryDocs = require("./app/models/docs/History.json");
+const UnitDocs = require("./app/models/docs/Unit.json");
 
 const Docs = {
     ChannelDocs,
@@ -35,19 +35,29 @@ const Docs = {
 /**
  * TYPES
  */
-const { AlarmTypes, AlarmPriorities, AlarmStates, DiamarAlarmStates } = require("app/types/alarm.types");
-const { EventCategories } = require("app/types/event.types");
+const { AlarmTypes, AlarmPriorities, CloudAlarmStates, DiamarAlarmStates } = require("./app/types/alarm.types");
+const { EventCategories } = require("./app/types/event.types");
 
 const Types = {
     AlarmTypes,
     AlarmPriorities,
-    AlarmStates,
+    CloudAlarmStates,
     DiamarAlarmStates,
     EventCategories,
 };
 
+/**
+ * EXTERNAL
+ */
+const mongoose = require("mongoose");
+const mongoosePaginate = require("mongoose-paginate-v2");
+const mongooseAggregatePaginate = require("mongoose-aggregate-paginate-v2");
+
 module.exports = {
     Schemas,
     Docs,
     Types,
+    mongoose,
+    mongoosePaginate,
+    mongooseAggregatePaginate,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sedni/cloud_common",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Common package for all types, resources and tools of Diamar Cloud",
     "main": "index.js",
     "scripts": {
@@ -18,10 +18,12 @@
     },
     "devDependencies": {
         "chai": "^5.1.1",
-        "eslint": "^8.57.0",
-        "eslint-plugin-node": "^11.1.0",
+        "@eslint/js": "^9.12.0",
+        "eslint": "^9.12.0",
+        "eslint-plugin-n": "^17.11.0",
+        "globals": "^15.11.0",
         "mocha": "^10.7.3",
         "nyc": "^17.0.0",
         "supertest": "^7.0.0"
     }
-}
+}

package/.eslintrc.js

@@ -1,32 +0,0 @@
-module.exports = {
-    env: {
-        node: true,
-        commonjs: true,
-        es2021: true,
-        mocha: true,
-    },
-    extends: [ "eslint:recommended", "plugin:node/recommended" ],
-    parserOptions: {
-        ecmaVersion: "latest",
-    },
-    rules: {
-        indent: [ "error", 4, { SwitchCase: 1 } ],
-        quotes: [ "error", "double" ],
-        semi: [ "error", "always" ],
-        "no-unused-vars": [
-            "error",
-            {
-                varsIgnorePattern: "should|expect|supertest|assert",
-            },
-        ],
-        curly: [ "error", "all" ],
-        "brace-style": [ "error", "allman" ],
-        "node/no-unpublished-require": [
-            "error",
-            {
-                allowModules: [ "swagger-ui-express" ],
-            },
-        ],
-        "node/no-missing-require": "off",
-    },
-};