@sedni/cloud_common 1.0.5 → 1.0.7

package/app/models/ChannelDataBucket.js

@@ -152,7 +152,7 @@ channeldataBucketSchema.statics.insertDataPoint = async function(timestamp, valu
     date.setMilliseconds(0);
 
     // Upsert the data point
-    const bucket = await this.updateOne(
+    const bucket = await this.findOneAndUpdate(
         { 
             start_date: date 
         }, 
@@ -178,7 +178,8 @@ channeldataBucketSchema.statics.insertDataPoint = async function(timestamp, valu
             } 
         }, 
         { 
-            upsert: true 
+            upsert: true,
+            new: true
         }
     );
 
@@ -253,14 +254,21 @@ channeldataBucketSchema.statics.getData = async function(start_date, end_date, p
     }
 
     // Remove the data inside the bucket that is not in the specified date range
-    data[0].data.removeDataPointsOutsideDateRange(start_date, end_date);
+    data[0].removeDataPointsOutsideDateRange(start_date, end_date);
 
     if(data.length > 1)
     {
-        data[1].data.removeDataPointsOutsideDateRange(start_date, end_date);
+        data[1].removeDataPointsOutsideDateRange(start_date, end_date);
     }
 
-    return plain ? data.flatMap(bucket => bucket.data) : data;
+    return plain ? data.flatMap(bucket => {
+        return bucket.data.map(data_point => {
+            return {
+                timestamp: data_point.timestamp,
+                value: data_point.value
+            };
+        });
+    }) : data;
 };
 
 

package/app/models/History.js

@@ -42,6 +42,10 @@ const historySchema = new mongoose.Schema({
         type: String,
         required: false,
     },
+    alarm_data: {
+        type: Object,
+        required: false,
+    },
 }, {
     timestamps: {
         createdAt: false,
@@ -55,13 +59,13 @@ const historySchema = new mongoose.Schema({
             ret.id = ret._id;
             delete ret._id;
             delete ret.__v;
-            ret.alarm_timestamp = ret.alarm_timestamp.getTime();
+            ret.alarm_timestamp = new Date(ret.alarm_timestamp).getTime();
             ret.alarm = {
-                priority: ret.alarm_priority,
-                state: ret.alarm_original_state ?? "Inactive",
-                type: ret.alarm_type,
-                value: ret.alarm_value === null ? "inf" : `${ret.alarm_value}`,
-                timestamp: new Date(ret.alarm_timestamp).getTime()
+                alarm_priority: ret.alarm_priority,
+                alarm_state: ret.alarm_original_state ?? "Inactive",
+                alarm_type: ret.alarm_type,
+                alarm_value: ret.alarm_value === null ? "inf" : `${ret.alarm_value}`,
+                alarm_timestamp: new Date(ret.alarm_timestamp).getTime()
             };
         },
     },

package/app/types/alarm.types.js

@@ -23,6 +23,7 @@ const CloudAlarmStates =
     WARNING_ACK:    "WarningAcknowledged",
     RETURN_NO_ACK:  "Unacknowledged",
     INHIBITED:      "Inhibited",
+    OFFSCAN :       "Offscan",
     UNDEFINED:      "Undefined",
 };
 
@@ -37,7 +38,7 @@ const AlarmTypes =
     ALARM_L:        "AlarmL",
     ALARM_LL:       "AlarmLl",
     ALARM_IFL:      "AlarmIfl",
-    ALARM_OFFSCAN:  "AlarmOffscan",
+    ALARM_OFFSCAN:  "AlarmOffScan",
     ALARM_FAIL:     "AlarmFail",
     ALARM_INH:      "AlarmInh",
     ALARM_UNK:      "AlarmUnk",

package/app/types/event.types.js

@@ -1,12 +1,13 @@
 const EventCategories = 
 {
-    ACCESS_CONTROL:     "ACCESS_CONTROL",
-    REQUEST_FAILURE:    "REQUEST_FAILURE",
-    OS:                 "OS",
-    CONTROL:            "CONTROL",
-    BACKUP:             "BACKUP",
-    CONFIG_CHANGE:      "CONFIG_CHANGE",
-    LOGS:               "LOGS"
+    ACCESS_CONTROL:     "AccessControl",
+    REQUEST_ERROR:      "RequestErrors",
+    OS:                 "OperatingSystemEvents",
+    CONTROL:            "ControlSystemEvents",
+    BACKUP:             "BackupAndRestoreEvents",
+    CONFIG_CHANGE:      "ConfigurationChanges",
+    LOGS:               "AuditLogEvents",
+    POTENTIAL_ATTACK:   "PotentialAttackActivity",
 };
 
 module.exports = {

package/index.js

@@ -38,6 +38,7 @@ const Types = {
  * EXTERNAL
  */
 const mongoose = require("mongoose");
+const mongooseAutopopulate = require("mongoose-autopopulate");
 const mongoosePaginate = require("mongoose-paginate-v2");
 const mongooseAggregatePaginate = require("mongoose-aggregate-paginate-v2");
 
@@ -48,4 +49,5 @@ module.exports = {
     mongoose,
     mongoosePaginate,
     mongooseAggregatePaginate,
+    mongooseAutopopulate,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sedni/cloud_common",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "description": "Common package for all types, resources and tools of Diamar Cloud",
     "main": "index.js",
     "scripts": {
@@ -30,4 +30,4 @@
         "sinon": "^19.0.2",
         "supertest": "^7.0.0"
     }
-}
+}

package/eslint.config.js

@@ -1,40 +0,0 @@
-const globals = require("globals");
-const pluginJs = require("@eslint/js");
-const nodePlugin = require("eslint-plugin-n");
-const mochaPlugin = require("eslint-plugin-mocha");
-
-module.exports = [
-    mochaPlugin.configs.recommended,
-    pluginJs.configs.recommended,
-    nodePlugin.configs["flat/recommended-script"],
-    {
-        files: ["app/**/*.js", "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/playground.js

@@ -1,11 +0,0 @@
-
-// Get the timestamp before importing the models 
-const start = Date.now();
-
-const ChannelDataBucket = require("./app/test/data/ChannelDataBucket");
-
-// Get the timestamp after importing the models
-const end = Date.now();
-
-// Print the difference
-console.log(`Time taken to import the models: ${end - start}ms`);