merged dev

hpcc-systems · Aug 28, 2024 · f5da4d1 · f5da4d1
2 parents 420fff0 + b2428d9
commit f5da4d1
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 8 deletions.
diff --git a/Tombolo/server/migrations/20240229155642-create-asr_domains-table.js b/Tombolo/server/migrations/20240229155642-create-asr_domains-table.js
@@ -15,6 +15,22 @@ module.exports = {
         unique: true,
         type: DataTypes.STRING,
       },
+      region: {
+        allowNull: false,
+        type: DataTypes.STRING,
+      },
+      severityThreshold: {
+        allowNull: false,
+        type: DataTypes.INTEGER,
+      },
+      severityAlertRecipients: {
+        allowNull: false,
+        type: DataTypes.JSON,
+      },
+      metaData: {
+        allowNull: true,
+        type: DataTypes.JSON,
+      },
       createdAt: {
         allowNull: false,
         type: DataTypes.DATE,

diff --git a/Tombolo/server/models/asr_domains.js b/Tombolo/server/models/asr_domains.js
@@ -14,6 +14,22 @@ module.exports = (sequelize, DataTypes) => {
         unique: true,
         type: DataTypes.STRING,
       },
+      region: {
+        allowNull: false,
+        type: DataTypes.STRING,
+      },
+      severityThreshold: {
+        allowNull: false,
+        type: DataTypes.INTEGER,
+      },
+      severityAlertRecipients: {
+        allowNull: false,
+        type: DataTypes.JSON,
+      },
+      metaData:{
+        allowNull: true,
+        type: DataTypes.JSON,
+      },
       createdAt: {
         allowNull: false,
         type: DataTypes.DATE,

diff --git a/Tombolo/server/routes/asr/read.js b/Tombolo/server/routes/asr/read.js
@@ -17,6 +17,7 @@ const DomainProduct = models.asr_domain_to_products;
 // Create a new domain
 router.post("/domains/",[
     body("name").notEmpty().withMessage("Domain name is required"),
+    body("region").notEmpty().withMessage("Region is required"),
     body("monitoringTypeIds")
       .optional()
       .isArray()
@@ -33,10 +34,11 @@ router.post("/domains/",[
 
       /* if monitoring type is provided, 
       create domain, next  iterate over monitoringTypeId and make entry to  asr_domain_monitoring_types*/
-      const { name, monitoringTypeIds, createdBy } = req.body;
+      const { name, region, severityThreshold, severityAlertRecipients, monitoringTypeIds, createdBy } =
+        req.body;
       let domain;
       if (monitoringTypeIds) {
-        domain = await Domains.create({ name, createdBy });
+        domain = await Domains.create({ name, region, severityThreshold, severityAlertRecipients, createdBy });
 
         // create domain monitoring type mapping
         const createPromises = monitoringTypeIds.map((monitoringId) => {
@@ -53,7 +55,7 @@ router.post("/domains/",[
 
       // if no monitoring type is provided, create domain without monitoring type
       else {
-        domain = await Domains.create({ name, createdBy });
+        domain = await Domains.create({ name, region, severityThreshold,severityAlertRecipients, createdBy });
       }
       res.status(200).json({message: "Domain created successfully", domain});
     } catch (error) {
@@ -125,12 +127,25 @@ router.patch(
       }
 
       // Update domain and delete or add relation in the junction table
-      const { name, monitoringTypeIds, updatedBy } = req.body;
+      const {
+        name,
+        region,
+        severityThreshold,
+        severityAlertRecipients, 
+        monitoringTypeIds,
+        updatedBy,
+      } = req.body;
       let response;
       if (monitoringTypeIds) {
         response = await sequelize.transaction(async (t) => {
           await Domains.update(
-            { name, updatedBy },
+            {
+              name,
+              region,
+              severityThreshold,
+              severityAlertRecipients,
+              updatedBy,
+            },
             { where: { id: req.params.id }, transaction: t }
           );
 
@@ -156,7 +171,7 @@ router.patch(
         });
       } else {
         response = await Domains.update(
-          { name, updatedBy },
+          { name, region, severityThreshold, severityAlertRecipients, updatedBy },
           { where: { id: req.params.id } }
         );
       }
@@ -251,7 +266,7 @@ router.get("/products/", async(req, res) => {
                attributes: [], // Exclude the junction table from the result
              },
              as: "associatedDomains",
-             attributes: ["id", "name"],
+             attributes: ["id", "name", "region", "severityThreshold", "severityAlertRecipients"],
            },
          ],
          order: [["createdAt", "DESC"]],
@@ -403,7 +418,13 @@ router.get("/domainsForSpecificMonitoring/:monitoringTypeId",
       include: [
         {
           model: Domains,
-          attributes: ["id", "name"],
+          attributes: [
+            "id",
+            "name",
+            "region",
+            "severityThreshold",
+            "severityAlertRecipients",
+          ],
         },
       ],
       raw: true,