@manyos/smileconnect-api 1.29.1 → 1.30.0

package/controller/eventLogController.js

@@ -4,7 +4,7 @@ const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(_
 const arquery = require('../util/arquery');
 const eventForm = 'MYS:SMILEconnect_QueueData';
 
-function createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, status, errorMsg, jsonData, ticketNumber2) {
+function createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, status, errorMsg, jsonData, ticketNumber2, ticketNumber3) {
     return new Promise((resolve, reject) => {
         let enable = process.env.EVENTLOG_ENABLE;
         if (enable != null && enable != undefined && enable.toLowerCase() == 'true') {
@@ -14,6 +14,7 @@ function createEventLog(smileId, client, ticketNumber, schemaName, eventName, ur
                 "VendorID" : client,
                 "TicketNumber" : ticketNumber,
                 "TicketNumber2" : ticketNumber2,
+                "TicketNumber3" : ticketNumber3,
                 "SchemaName" : schemaName,
                 "ErrorMsg" : errorMsg,
                 "Direction" : "Inbound",
@@ -34,23 +35,25 @@ function createEventLog(smileId, client, ticketNumber, schemaName, eventName, ur
     });
 }
 
-function createErrorLog(smileId, client, ticketNumber, schemaName, eventName, url, errorMsg, jsonData, ticketNumber2) {
-    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Error', errorMsg, jsonData, ticketNumber2);
+function createErrorLog(smileId, client, ticketNumber, schemaName, eventName, url, errorMsg, jsonData, ticketNumber2, ticketNumber3) {
+    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Error', errorMsg, jsonData, ticketNumber2, ticketNumber3);
 }
 
-function createSuccessLog(smileId, client, ticketNumber, schemaName, eventName, url, jsonData, ticketNumber2) {
-    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Done', null, jsonData, ticketNumber2);
+function createSuccessLog(smileId, client, ticketNumber, schemaName, eventName, url, jsonData, ticketNumber2, ticketNumber3) {
+    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Done', null, jsonData, ticketNumber2, ticketNumber3);
 }
 
-function setEventData(req, eventName, schemaName, ticketNumber, jsonData, ticketNumber2) {
+/*
+function setEventData(req, eventName, schemaName, ticketNumber, jsonData, ticketNumber2, ticketNumber3) {
     req.eventData = {
         event: eventName,
         schema: schemaName,
         "ticketNumber": ticketNumber,
         "ticketNumber2": ticketNumber2,
+        "ticketNumber3": ticketNumber3,
         "jsonData" : jsonData
     };
-}
+}*/
 
 function setEventData(req, eventBase, eventAction, schemaName, ticketNumber, jsonData, ticketNumber2, ticketNumber3) {
     req.eventData = {
@@ -58,6 +61,7 @@ function setEventData(req, eventBase, eventAction, schemaName, ticketNumber, jso
         schema: schemaName,
         "ticketNumber": ticketNumber,
         "ticketNumber2": ticketNumber2,
+        "ticketNumber3": ticketNumber3,
         "jsonData" : jsonData
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manyos/smileconnect-api",
-  "version": "1.29.1",
+  "version": "1.30.0",
   "description": "A proxy and abstraction layer for BMCs IT Service Management Suite",
   "main": "app.js",
   "scripts": {

package/routes/scriptRoutes.js

@@ -130,10 +130,7 @@ module.exports = (function() {
             );
 
             createAndUpdateScript(scriptId, req.body.code).then(script => {
-                req.result = {
-                    id: scriptId,
-                    code: script
-                };
+                req.result = script;
                 log.debug('run next');
                 next();
             }).catch (error=> {

package/util/responsehandler.js

@@ -38,7 +38,8 @@ function logErrors(err, req, res, next) {
             req.method + ':' + req.url,
             JSON.stringify(err, null, 2) || String(err),
             eventData.jsonData,
-            eventData.ticketNumber2);
+            eventData.ticketNumber2,
+            eventData.ticketNumber3);
     }
 
     next(err);