@oneuptime/common 7.0.3882 → 7.0.3899

package/Server/Utils/Telemetry/Telemetry.ts

@@ -1,21 +1,26 @@
+import { Dictionary } from "lodash";
 import { JSONArray, JSONObject, JSONValue } from "../../../Types/JSON";
-import JSONFunctions from "../../../Types/JSONFunctions";
 import ObjectID from "../../../Types/ObjectID";
 import TelemetryType from "../../../Types/Telemetry/TelemetryType";
-import ArrayUtil from "../../../Utils/Array";
 import GlobalCache from "../../Infrastructure/GlobalCache";
 import TelemetryAttributeService from "../../Services/TelemetryAttributeService";
 import CaptureSpan from "./CaptureSpan";
+import logger from "../Logger";
+
+export type AttributeType = string | number | boolean | null;
 
 export default class TelemetryUtil {
   @CaptureSpan()
   public static async indexAttributes(data: {
-    attributes: string[];
+    attributes: Array<string>;
     projectId: ObjectID;
     telemetryType: TelemetryType;
   }): Promise<void> {
     // index attributes
 
+    logger.debug("Indexing attributes");
+    logger.debug("data: " + JSON.stringify(data, null, 2));
+
     const cacheKey: string =
       data.projectId.toString() + "_" + data.telemetryType;
 
@@ -28,7 +33,9 @@ export default class TelemetryUtil {
 
     // check if keys are missing in cache
 
-    for (const key of data.attributes) {
+    const attributeKeys: string[] = data.attributes;
+
+    for (const key of attributeKeys) {
       if (!cacheKeys.includes(key)) {
         isKeysMissingInCache = true;
         break;
@@ -42,11 +49,9 @@ export default class TelemetryUtil {
         telemetryType: data.telemetryType,
       });
 
-      const mergedKeys: Array<string> = ArrayUtil.removeDuplicates([
-        ...dbKeys,
-        ...data.attributes,
-        ...cacheKeys,
-      ]);
+      const mergedKeys: Array<string> = Array.from(
+        new Set([...dbKeys, ...attributeKeys, ...cacheKeys]),
+      );
 
       await GlobalCache.setStringArray(
         "telemetryAttributesKeys",
@@ -62,96 +67,133 @@ export default class TelemetryUtil {
     }
   }
 
+  public static getAttributesForServiceIdAndServiceName(data: {
+    serviceId: ObjectID;
+    serviceName: string;
+  }): Dictionary<AttributeType> {
+    // get attributes for service id and service name
+    return {
+      "oneuptime.service.id": data.serviceId.toString(),
+      "oneuptime.service.name": data.serviceName,
+    };
+  }
+
   @CaptureSpan()
   public static getAttributes(data: {
+    prefixKeysWithString: string;
     items: JSONArray;
-    telemetryServiceId?: ObjectID;
-    telemetryServiceName?: string;
-  }): JSONObject {
+  }): Dictionary<AttributeType | Array<AttributeType>> {
     const { items } = data;
+    let { prefixKeysWithString } = data;
 
-    const finalObj: JSONObject = {};
-    // We need to convert this to date.
-    const attributes: JSONArray = items;
+    if (prefixKeysWithString) {
+      prefixKeysWithString = prefixKeysWithString + ".";
+    }
 
-    type GetValueFunction = (value: JSONValue) => JSONValue;
-
-    const getValue: GetValueFunction = (value: JSONValue): JSONValue => {
-      value = value as JSONObject;
-
-      if (value["stringValue"]) {
-        value = value["stringValue"] as string;
-      } else if (value["intValue"]) {
-        value = value["intValue"] as number;
-      } else if (value["doubleValue"]) {
-        value = value["doubleValue"] as number;
-      } else if (value["boolValue"]) {
-        value = value["boolValue"] as boolean;
-      } else if (
-        value["arrayValue"] &&
-        (value["arrayValue"] as JSONObject)["values"]
-      ) {
-        value = (
-          (value["arrayValue"] as JSONObject)["values"] as JSONArray
-        ).map((v: JSONObject) => {
-          return getValue(v);
-        });
-      } else if (
-        value["mapValue"] &&
-        (value["mapValue"] as JSONObject)["fields"]
-      ) {
-        value = getValue((value["mapValue"] as JSONObject)["fields"]);
-      } else if (value["nullValue"]) {
-        value = null;
-      }
+    let finalObj: Dictionary<AttributeType | Array<AttributeType>> = {};
+    const attributes: JSONArray = items;
 
-      return value;
-    };
+    if (!attributes) {
+      return finalObj;
+    }
 
-    if (attributes) {
-      for (const attribute of attributes) {
-        if (attribute["key"] && typeof attribute["key"] === "string") {
-          const value: JSONValue = getValue(attribute["value"]);
-          finalObj[attribute["key"]] = value;
+    for (const attribute of attributes) {
+      if (attribute["key"] && typeof attribute["key"] === "string") {
+        const keyWithPrefix: string = `${prefixKeysWithString}${attribute["key"]}`;
+
+        const value:
+          | AttributeType
+          | Dictionary<AttributeType>
+          | Array<AttributeType> = this.getAttributeValues(
+          keyWithPrefix,
+          attribute["value"],
+        );
+
+        if (Array.isArray(value)) {
+          finalObj = { ...finalObj, [keyWithPrefix]: value };
+        } else if (typeof value === "object" && value !== null) {
+          finalObj = { ...finalObj, ...(value as Dictionary<AttributeType>) };
+        } else {
+          finalObj[keyWithPrefix] = value;
         }
       }
     }
 
-    // add oneuptime specific attributes
-    if (!finalObj["oneuptime"]) {
-      finalObj["oneuptime"] = {};
-    }
-
-    if (!(finalObj["oneuptime"] as JSONObject)["telemetry"]) {
-      (finalObj["oneuptime"] as JSONObject)["telemetry"] = {};
-    }
+    return finalObj;
+  }
 
-    if (
-      !((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-        "service"
-      ]
+  public static getAttributeValues(
+    prefixKeysWithString: string,
+    value: JSONValue,
+  ): AttributeType | Dictionary<AttributeType> | Array<AttributeType> {
+    let finalObj:
+      | Dictionary<AttributeType>
+      | AttributeType
+      | Array<AttributeType> = null;
+    value = value as JSONObject;
+
+    if (value["stringValue"]) {
+      finalObj = value["stringValue"] as string;
+    } else if (value["intValue"]) {
+      finalObj = value["intValue"] as number;
+    } else if (value["doubleValue"]) {
+      finalObj = value["doubleValue"] as number;
+    } else if (value["boolValue"]) {
+      finalObj = value["boolValue"] as boolean;
+    } else if (
+      value["arrayValue"] &&
+      (value["arrayValue"] as JSONObject)["values"]
     ) {
-      ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-        "service"
-      ] = {};
-    }
-
-    if (data.telemetryServiceId) {
-      (
-        ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-          "service"
-        ] as JSONObject
-      )["id"] = data.telemetryServiceId.toString();
+      const values: JSONArray = (value["arrayValue"] as JSONObject)[
+        "values"
+      ] as JSONArray;
+      finalObj = values.map((v: JSONObject) => {
+        return this.getAttributeValues(
+          prefixKeysWithString,
+          v,
+        ) as AttributeType;
+      }) as Array<AttributeType>;
+    } else if (
+      value["mapValue"] &&
+      (value["mapValue"] as JSONObject)["fields"]
+    ) {
+      const fields: JSONObject = (value["mapValue"] as JSONObject)?.[
+        "fields"
+      ] as JSONObject;
+
+      const flattenedFields: Dictionary<AttributeType> = {};
+      for (const key in fields) {
+        const prefixKey: string = `${prefixKeysWithString}.${key}`;
+        const nestedValue: AttributeType | Dictionary<AttributeType> =
+          this.getAttributeValues(prefixKey, fields[key]) as AttributeType;
+        if (typeof nestedValue === "object" && nestedValue !== null) {
+          for (const nestedKey in nestedValue as Dictionary<AttributeType>) {
+            flattenedFields[`${prefixKey}.${nestedKey}`] = (
+              nestedValue as Dictionary<AttributeType>
+            )[nestedKey] as AttributeType;
+          }
+        } else {
+          flattenedFields[prefixKey] = nestedValue;
+        }
+      }
+      finalObj = flattenedFields;
     }
-
-    if (data.telemetryServiceName) {
-      (
-        ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-          "service"
-        ] as JSONObject
-      )["name"] = data.telemetryServiceName;
+    // kvlistValue
+    else if (
+      value["kvlistValue"] &&
+      (value["kvlistValue"] as JSONObject)["values"]
+    ) {
+      const values: JSONArray = (value["kvlistValue"] as JSONObject)[
+        "values"
+      ] as JSONArray;
+      finalObj = this.getAttributes({
+        prefixKeysWithString,
+        items: values,
+      }) as Dictionary<AttributeType>;
+    } else if (value["nullValue"]) {
+      finalObj = null;
     }
 
-    return JSONFunctions.flattenObject(finalObj);
+    return finalObj;
   }
 }

package/Server/Utils/Workspace/Slack/Slack.ts

@@ -30,6 +30,7 @@ import SlackifyMarkdown from "slackify-markdown";
 import { DropdownOption } from "../../../../UI/Components/Dropdown/Dropdown";
 import OneUptimeDate from "../../../../Types/Date";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
+import BadDataException from "../../../../Types/Exception/BadDataException";
 
 export default class SlackUtil extends WorkspaceBase {
   @CaptureSpan()
@@ -123,7 +124,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((result.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(result.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (result.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     logger.debug("Modal shown to user successfully.");
@@ -187,7 +191,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     logger.debug("Channel joined successfully with data:");
@@ -240,7 +247,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     logger.debug("User invited to channel successfully.");
@@ -344,7 +354,7 @@ export default class SlackUtil extends WorkspaceBase {
 
     if (!channels[data.channelName]) {
       logger.error("Channel not found.");
-      throw new Error("Channel not found.");
+      throw new BadDataException("Channel not found.");
     }
 
     logger.debug("Workspace channel ID obtained:");
@@ -386,7 +396,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     if (
@@ -440,7 +453,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     const channels: Dictionary<WorkspaceChannel> = {};
@@ -527,6 +543,33 @@ export default class SlackUtil extends WorkspaceBase {
     return values;
   }
 
+  @CaptureSpan()
+  public static override async doesChannelExist(data: {
+    authToken: string;
+    channelName: string;
+  }): Promise<boolean> {
+    // if channel name starts with #, remove it
+    if (data.channelName && data.channelName.startsWith("#")) {
+      data.channelName = data.channelName.substring(1);
+    }
+
+    // convert channel name to lowercase
+    data.channelName = data.channelName.toLowerCase();
+
+    // get channel id from channel name
+    const channels: Dictionary<WorkspaceChannel> =
+      await this.getAllWorkspaceChannels({
+        authToken: data.authToken,
+      });
+
+    // if this channel exists
+    if (channels[data.channelName]) {
+      return true;
+    }
+
+    return false;
+  }
+
   @CaptureSpan()
   public static override async sendMessage(data: {
     workspaceMessagePayload: WorkspaceMessagePayload;
@@ -664,7 +707,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     logger.debug("Payload blocks sent to channel successfully.");
@@ -736,7 +782,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     if (
@@ -1111,7 +1160,10 @@ export default class SlackUtil extends WorkspaceBase {
     if ((response.jsonData as JSONObject)?.["ok"] !== true) {
       logger.error("Invalid response from Slack API:");
       logger.error(response.jsonData);
-      throw new BadRequestException("Invalid response");
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
     }
 
     // check if the user is in the channel
@@ -1175,7 +1227,10 @@ export default class SlackUtil extends WorkspaceBase {
       if ((response.jsonData as JSONObject)?.["ok"] !== true) {
         logger.error("Invalid response from Slack API:");
         logger.error(response.jsonData);
-        throw new BadRequestException("Invalid response");
+        const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+          "error"
+        ] as string;
+        throw new BadRequestException("Error from Slack " + messageFromSlack);
       }
 
       // check if the user is in the channel

package/Server/Utils/Workspace/WorkspaceBase.ts

@@ -48,6 +48,15 @@ export default class WorkspaceBase {
   }): Promise<boolean> {
     throw new NotImplementedException();
   }
+
+  @CaptureSpan()
+  public static async doesChannelExist(_data: {
+    authToken: string;
+    channelName: string;
+  }): Promise<boolean> {
+    throw new NotImplementedException();
+  }
+
   @CaptureSpan()
   public static async getUsernameFromUserId(_data: {
     authToken: string;

package/build/dist/Models/AnalyticsModels/TelemetryAttribute.js

@@ -101,11 +101,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
                     },
                 }),
                 new AnalyticsTableColumn({
-                    key: "attribute",
-                    title: "Attribute",
-                    description: "Attribute",
+                    key: "attributes",
+                    title: "Attributes",
+                    description: "Attributes",
                     required: true,
-                    type: TableColumnType.Text,
+                    type: TableColumnType.JSONArray,
                     accessControl: {
                         read: [
                             Permission.ProjectOwner,
@@ -143,11 +143,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
     set telemetryType(v) {
         this.setColumnValue("telemetryType", v);
     }
-    get attribute() {
-        return this.getColumnValue("attribute");
+    get attributes() {
+        return this.getColumnValue("attributes");
     }
-    set attribute(v) {
-        this.setColumnValue("attribute", v);
+    set attributes(v) {
+        this.setColumnValue("attributes", v);
     }
 }
 //# sourceMappingURL=TelemetryAttribute.js.map

package/build/dist/Models/AnalyticsModels/TelemetryAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryAttribute.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/TelemetryAttribute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryAttribute.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/TelemetryAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,oBAAoB,MAAM,oDAAoD,CAAC;AACtF,OAAO,oBAAoB,MAAM,2CAA2C,CAAC;AAC7E,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAG5E,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,kBAAkB;IAChE;QACE,KAAK,CAAC;YACJ,SAAS,EAAE,oBAAoB;YAC/B,WAAW,EAAE,oBAAoB,CAAC,SAAS;YAC3C,YAAY,EAAE,qBAAqB;YACnC,UAAU,EAAE,sBAAsB;YAClC,WAAW,EAAE,IAAI,KAAK,CAAC,uBAAuB,CAAC;YAC/C,aAAa,EAAE;gBACb,IAAI,EAAE;oBACJ,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,0BAA0B;oBACrC,UAAU,CAAC,uBAAuB;oBAClC,UAAU,CAAC,2BAA2B;iBACvC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,4BAA4B;oBACvC,UAAU,CAAC,yBAAyB;oBACpC,UAAU,CAAC,6BAA6B;iBACzC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,0BAA0B;oBACrC,UAAU,CAAC,uBAAuB;oBAClC,UAAU,CAAC,2BAA2B;iBACvC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,4BAA4B;oBACvC,UAAU,CAAC,yBAAyB;oBACpC,UAAU,CAAC,6BAA6B;iBACzC;aACF;YACD,YAAY,EAAE;gBACZ,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,WAAW;oBAChB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,eAAe;oBAC5B,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,QAAQ;oBAC9B,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;gBAEF,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,eAAe;oBACpB,KAAK,EAAE,gBAAgB;oBACvB,WAAW,EAAE,mBAAmB;oBAChC,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,IAAI;oBAC1B,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;gBAEF,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,YAAY;oBACjB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,YAAY;oBACzB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,SAAS;oBAC/B,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;aACH;YACD,QAAQ,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;YACxC,WAAW,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAyB,CAAC;IAClE,CAAC;IAED,IAAW,SAAS,CAAC,CAAuB;QAC1C,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAA8B,CAAC;IAC3E,CAAC;IAED,IAAW,aAAa,CAAC,CAA4B;QACnD,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAA8B,CAAC;IACxE,CAAC;IAED,IAAW,UAAU,CAAC,CAA4B;QAChD,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;CACF"}

package/build/dist/Server/API/TelemetryAPI.js

@@ -5,7 +5,6 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import CommonAPI from "./CommonAPI";
 import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 import TelemetryAttributeService from "../Services/TelemetryAttributeService";
-import ArrayUtil from "Common/Utils/Array";
 const router = Express.getRouter();
 router.post("/telemetry/metrics/get-attributes", UserMiddleware.getUserMiddleware, async (req, res, next) => {
     return getAttributes(req, res, next, TelemetryType.Metric);
@@ -25,10 +24,10 @@ const getAttributes = async (req, res, next, telemetryType) => {
         if (!databaseProps.tenantId) {
             return Response.sendErrorResponse(req, res, new BadDataException("Invalid Project ID"));
         }
-        const attributes = ArrayUtil.removeDuplicates(await TelemetryAttributeService.fetchAttributes({
+        const attributes = await TelemetryAttributeService.fetchAttributes({
             projectId: databaseProps.tenantId,
             telemetryType,
-        }));
+        });
         return Response.sendJsonObjectResponse(req, res, {
             attributes: attributes,
         });

package/build/dist/Server/API/TelemetryAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,OAKN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAC9E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,MAAM,MAAM,GAAkB,OAAO,CAAC,SAAS,EAAE,CAAC;AAElD,MAAM,CAAC,IAAI,CACT,mCAAmC,EACnC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,gCAAgC,EAChC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,kCAAkC,EAClC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC,CACF,CAAC;AASF,MAAM,aAAa,GAA0B,KAAK,EAChD,GAAmB,EACnB,GAAoB,EACpB,IAAkB,EAClB,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GACjB,MAAM,SAAS,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAC3C,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAa,SAAS,CAAC,gBAAgB,CACrD,MAAM,yBAAyB,CAAC,eAAe,CAAC;YAC9C,SAAS,EAAE,aAAa,CAAC,QAAQ;YACjC,aAAa;SACd,CAAC,CACH,CAAC;QAEF,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;YAC/C,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,OAKN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAE9E,MAAM,MAAM,GAAkB,OAAO,CAAC,SAAS,EAAE,CAAC;AAElD,MAAM,CAAC,IAAI,CACT,mCAAmC,EACnC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,gCAAgC,EAChC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,kCAAkC,EAClC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC,CACF,CAAC;AASF,MAAM,aAAa,GAA0B,KAAK,EAChD,GAAmB,EACnB,GAAoB,EACpB,IAAkB,EAClB,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GACjB,MAAM,SAAS,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAC3C,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GACd,MAAM,yBAAyB,CAAC,eAAe,CAAC;YAC9C,SAAS,EAAE,aAAa,CAAC,QAAQ;YACjC,aAAa;SACd,CAAC,CAAC;QAEL,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;YAC/C,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/build/dist/Server/API/WorkspaceNotificationRuleAPI.js

@@ -0,0 +1,29 @@
+import UserMiddleware from "../Middleware/UserAuthorization";
+import WorkspaceNotificationRuleService from "../Services/WorkspaceNotificationRuleService";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+import CommonAPI from "./CommonAPI";
+import WorkspaceNotificationRule from "Common/Models/DatabaseModels/WorkspaceNotificationRule";
+import ObjectID from "../../Types/ObjectID";
+export default class WorkspaceNotificationRuleAPI extends BaseAPI {
+    constructor() {
+        var _a;
+        super(WorkspaceNotificationRule, WorkspaceNotificationRuleService);
+        this.router.get(`${(_a = new this.entityType().getCrudApiPath()) === null || _a === void 0 ? void 0 : _a.toString()}/test/:workspaceNotifcationRuleId`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
+            try {
+                const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+                await this.service.testRule({
+                    ruleId: new ObjectID(req.params["workspaceNotifcationRuleId"]),
+                    props: databaseProps,
+                    projectId: databaseProps.tenantId,
+                    testByUserId: databaseProps.userId,
+                });
+                return Response.sendEmptySuccessResponse(req, res);
+            }
+            catch (e) {
+                next(e);
+            }
+        });
+    }
+}
+//# sourceMappingURL=WorkspaceNotificationRuleAPI.js.map

package/build/dist/Server/API/WorkspaceNotificationRuleAPI.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceNotificationRuleAPI.js","sourceRoot":"","sources":["../../../../Server/API/WorkspaceNotificationRuleAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,gCAEN,MAAM,8CAA8C,CAAC;AAMtD,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,yBAAyB,MAAM,wDAAwD,CAAC;AAC/F,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,OAGzD;IACC;;QACE,KAAK,CAAC,yBAAyB,EAAE,gCAAgC,CAAC,CAAC;QAEnE,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,GAAG,MAAA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,0CAAE,QAAQ,EAAE,mCAAmC,EACxF,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI,CAAC;gBACH,MAAM,aAAa,GACjB,MAAM,SAAS,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;gBAEzD,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBAC1B,MAAM,EAAE,IAAI,QAAQ,CAClB,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAW,CACnD;oBACD,KAAK,EAAE,aAAa;oBACpB,SAAS,EAAE,aAAa,CAAC,QAAS;oBAClC,YAAY,EAAE,aAAa,CAAC,MAAO;iBACpC,CAAC,CAAC;gBAEH,OAAO,QAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,CAAC,CAAC,CAAC;YACV,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}

package/build/dist/Server/Services/IncidentService.js

@@ -228,7 +228,9 @@ export class Service extends DatabaseService {
         if (!lastIncident) {
             return 0;
         }
-        return lastIncident.incidentNumber || 0;
+        return lastIncident.incidentNumber
+            ? Number(lastIncident.incidentNumber)
+            : 0;
     }
     async onBeforeCreate(createBy) {
         if (!createBy.props.tenantId && !createBy.props.isRoot) {