notification-processor 4.23.0 → 4.24.0

package/lib/observers/monitoringCenter.observer.js

@@ -36,17 +36,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           accessKeyId = _ref$connection.accessKeyId,
           secretAccessKey = _ref$connection.secretAccessKey,
           deliveryStream = _ref$connection.deliveryStream,
+          jobsDeliveryStream = _ref$connection.jobsDeliveryStream,
           region = _ref$connection.region;
 
       _classCallCheck(this, MonitoringCenterObserver);
 
       this.registerRecord = this.registerRecord.bind(this);
+      this._registerJob = this._registerJob.bind(this);
+      this._registerExecution = this._registerExecution.bind(this);
       this.sender = sender;
       this.clientId = clientId;
       this.app = app1;
       this.job = job1;
       this.propertiesToOmit = propertiesToOmit;
       this.deliveryStream = deliveryStream;
+      this.jobsDeliveryStream = jobsDeliveryStream;
       this.firehose = new AWS.Firehose({ accessKeyId: accessKeyId, secretAccessKey: secretAccessKey, region: region });
       this.uploadToFirehose = Promise.promisify(this.firehose.putRecord).bind(this.firehose);
     }
@@ -74,15 +78,18 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       value: function registerRecord(payload, executionStatus) {
         var _this2 = this;
 
-        return this._mapper(_.merge({ executionStatus: executionStatus }, payload)).tap(function (record) {
-          return debug("Record to save in firehose %s %j", _this2.deliveryStream, record);
+        var deliveryStreamName, jobId;
+        jobId = _.get(payload, 'notification.message.JobId');
+        deliveryStreamName = jobId ? this.jobsDeliveryStream : this.deliveryStream;
+        return this._mapper(_.merge({ executionStatus: executionStatus, jobId: jobId }, payload)).tap(function (record) {
+          return debug("Record to save in firehose %s %j", deliveryStreamName, record);
         }).then(function (record) {
           var __uploadToFirehose, uploadParams;
           if (_.isEmpty(record)) {
             return;
           }
           uploadParams = {
-            DeliveryStreamName: _this2.deliveryStream,
+            DeliveryStreamName: deliveryStreamName,
             Record: {
               Data: JSON.stringify(record)
             }
@@ -110,7 +117,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             notification = _ref2.notification,
             error = _ref2.error,
             warnings = _ref2.warnings,
-            executionStatus = _ref2.executionStatus;
+            executionStatus = _ref2.executionStatus,
+            jobId = _ref2.jobId;
 
         return Promise.method(this.sender.monitoringCenterFields.bind(this.sender))(notification).then(function (_ref3) {
           var eventType = _ref3.eventType,
@@ -126,62 +134,92 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               job = _ref3.job,
               partialMessage = _ref3.partialMessage;
 
-          var errorMessage, errorType, now, theRequest;
+          var basicRegister, errorType, executionRegister, now, theRequest;
           if (!eventId) {
             return Promise.resolve({});
           }
           theRequest = _.get(error, "detail.request") || _.get(error, "cause.detail.request");
           errorType = _this3._retrieveMessageFromError(error, TYPE_PROPERTIES, "unknown");
-          errorMessage = _this3._retrieveMessageFromError(error, MESSAGE_PROPERTIES, "");
           if (/the operation did not complete within the allocated time/gi.test(errorType)) {
             errorType = "timed_out";
           }
           now = new Date();
-          return {
-            id: id,
-            executionId: id,
-            app: app || parseInt(_this3.clientId) || null,
-            type: eventType || "service-bus",
-            company: companyId,
-            user: userId,
-            event: eventId,
-            parent: parentEventId,
-            externalreference: externalReference,
-            userexternalreference: userExternalReference,
-            timestamp: now.getTime(),
-            date: now.toISOString(),
-            year: moment(now).format('YYYY'),
-            month: moment(now).format('MM'),
-            day: moment(now).format('DD'),
-            hour: moment(now).format('HH'),
-            payload: JSON.stringify({
-              clientId: _this3.clientId,
-              job: _this3.job,
-              app: _this3.app,
-              error: _.omit(error, ["detail.request", "cause.detail.request"]),
-              request: _.omit(theRequest, _.castArray(_this3.propertiesToOmit).concat("auth")),
-              tags: _.get(error, "tags", []),
-              message: partialMessage || notification.message
-            }),
-            status: executionStatus,
-            resource: resource,
-            integration: _this3.app + "|" + (job || _this3.job),
-            // Generic app fields
-            event_timestamp: eventTimestamp || now.getTime(),
-            error_type: errorType,
-            output_message: errorMessage,
-            user_settings_version: null, //TODO
-            env_version: null, //TODO
-            code_version: null, //TODO
-            warnings: warnings != null ? warnings.map(function (warning) {
-              return {
-                type: _this3._retrieveMessageFromError(warning, TYPE_PROPERTIES, "unknown"),
-                message: _this3._retrieveMessageFromError(warning, MESSAGE_PROPERTIES, "")
-              };
-            }) : void 0
-          };
+          basicRegister = { id: id, app: app, companyId: companyId, now: now, executionStatus: executionStatus, errorType: errorType, job: job };
+          executionRegister = { eventType: eventType, userId: userId, eventId: eventId, parentEventId: parentEventId, externalReference: externalReference, userExternalReference: userExternalReference, error: error, theRequest: theRequest, partialMessage: partialMessage, notification: notification, resource: resource, eventTimestamp: eventTimestamp, warnings: warnings };
+          if (jobId) {
+            return _this3._registerJob(basicRegister, jobId);
+          } else {
+            return _this3._registerExecution(basicRegister, executionRegister);
+          }
         });
       }
+    }, {
+      key: "_registerJob",
+      value: function _registerJob(basicRegister, jobId) {
+        return {
+          id: basicRegister.id,
+          app: basicRegister.app || parseInt(this.clientId) || null,
+          trigger_id: jobId,
+          trigger_mode: "scheduled",
+          company: basicRegister.companyId,
+          start_time: basicRegister.now.getTime(),
+          integration: this.app + "|" + (basicRegister.job || this.job),
+          error_type: basicRegister.errorType,
+          status: basicRegister.executionStatus
+        };
+      }
+    }, {
+      key: "_registerExecution",
+      value: function _registerExecution(basicRegister, executionRegister) {
+        var _this4 = this;
+
+        var errorMessage, now, ref;
+        now = basicRegister.now;
+        errorMessage = this._retrieveMessageFromError(executionRegister.error, MESSAGE_PROPERTIES, "");
+        return {
+          id: basicRegister.id,
+          executionId: basicRegister.id,
+          app: basicRegister.app || parseInt(this.clientId) || null,
+          type: executionRegister.eventType || "service-bus",
+          company: basicRegister.companyId,
+          user: executionRegister.userId,
+          event: executionRegister.eventId,
+          parent: executionRegister.parentEventId,
+          externalreference: executionRegister.externalReference,
+          userexternalreference: executionRegister.userExternalReference,
+          timestamp: now.getTime(),
+          date: now.toISOString(),
+          year: moment(now).format('YYYY'),
+          month: moment(now).format('MM'),
+          day: moment(now).format('DD'),
+          hour: moment(now).format('HH'),
+          payload: JSON.stringify({
+            clientId: this.clientId,
+            job: this.job,
+            app: this.app,
+            error: _.omit(executionRegister.error, ["detail.request", "cause.detail.request"]),
+            request: _.omit(executionRegister.theRequest, _.castArray(this.propertiesToOmit).concat("auth")),
+            tags: _.get(executionRegister.error, "tags", []),
+            message: executionRegister.partialMessage || executionRegister.notification.message
+          }),
+          status: basicRegister.executionStatus,
+          resource: executionRegister.resource,
+          integration: this.app + "|" + (basicRegister.job || this.job),
+          // Generic app fields
+          event_timestamp: executionRegister.eventTimestamp || now.getTime(),
+          error_type: basicRegister.errorType,
+          output_message: errorMessage,
+          user_settings_version: null, //TODO
+          env_version: null, //TODO
+          code_version: null, //TODO
+          warnings: (ref = executionRegister.warnings) != null ? ref.map(function (warning) {
+            return {
+              type: _this4._retrieveMessageFromError(warning, TYPE_PROPERTIES, "unknown"),
+              message: _this4._retrieveMessageFromError(warning, MESSAGE_PROPERTIES, "")
+            };
+          }) : void 0
+        };
+      }
     }, {
       key: "_retrieveMessageFromError",
       value: function _retrieveMessageFromError(error, properties, defaultValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notification-processor",
-  "version": "4.23.0",
+  "version": "4.24.0",
   "description": "notification-processor",
   "main": "index.js",
   "scripts": {