@manyos/smileconnect-api 1.63.3 → 1.64.0

package/app.js

@@ -2,7 +2,7 @@
 const app = require('express')();
 
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 const passport = require('passport');
 const JwtStrategy = require('passport-jwt').Strategy,
@@ -202,6 +202,12 @@ app.use(fileUpload({
     debug: true
 }));
 
+//add initial logger
+app.use(function (req, res, next) {
+   req.log = log.child({requestId: req.id});
+   next();
+});
+
 //global check for compatibility
 app.use(function (req, res, next) {
     if (req.query.include && req.query.includeObjects) {
@@ -268,9 +274,11 @@ app.use(function (req, res, next) {
 app.use(function (req, res, next) {
     req.globalScriptParams = {
         query: req.query,
-        user: req.user,
-        log: log.child({req_id: req.id, clientId:req.clientId}, true)
+        user: req.user
     }
+    req.log = req.log.child({
+        clientId: req.clientId
+    });
     // Für Scripte einen globalen parameter bereitstellen, der den org. Body enthält. Damit hat man auch noch in Post Scripten Zugriff auf customAttributes die beim Mapping entfernt werden.
     if (req.body) {
         try {

package/conf/clients.json

@@ -1989,7 +1989,6 @@
         "clientLimit": 100000,
         "impersonateUser": "rhannemann",
         "allowDynamicImpersonate": true,
-        "translateSelectionFieldsX": false,
         "translateSelectionFields": true
       },
       "custom_Sample:Enrollments": {
@@ -2101,9 +2100,7 @@
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [
-              "notfetchresult"
-            ]
+            "postMapping": []
           }
         }
       },
@@ -2299,9 +2296,7 @@
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           },
           "POST": {
@@ -2388,9 +2383,7 @@
             "preMapping": [
               "p2"
             ],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": [
               "INC_CreateWorklog_OnCreate"
             ]
@@ -2437,10 +2430,6 @@
             "name": "Urgency",
             "value": "4000"
           },
-          {
-            "name": "Status",
-            "value": "0"
-          },
           {
             "name": "Investigation Driver",
             "value": "High Impact Incident"
@@ -2508,9 +2497,7 @@
         "scripts": {
           "POST": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           }
         },
@@ -2578,25 +2565,17 @@
           {
             "name": "TaskType",
             "value": "2000"
-          },
-          {
-            "name": "Status",
-            "value": "1000"
           }
         ],
         "scripts": {
           "POST": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           }
         }
@@ -2625,16 +2604,12 @@
         "scripts": {
           "POST": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [
-              "notFetchResult"
-            ],
+            "postMapping": [],
             "afterExecution": []
           }
         },

package/controller/cmdbobjectController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');
@@ -207,7 +207,7 @@ async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, include
         cmdbObject.relations.ciRelations = relations;
     }
     if (includeArray.includes('ticketRelations')) {
-        const relations = await ticketCIRelationController.getCITicketRelations(cmdbObject.id);
+        const relations = await ticketCIRelationController.getCITicketRelations(cmdbObject.id, undefined, log);
         cmdbObject.relations.ticketRelations = relations;
     }
     if (includeArray.includes('personRelations')) {

package/controller/customFormController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');

package/controller/eventLogController.js

@@ -1,10 +1,8 @@
 require('dotenv').config();
-const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
 const arquery = require('../util/arquery');
 const eventForm = 'MYS:SMILEconnect_QueueData';
 
-function createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, status, errorMsg, jsonData, ticketNumber2, ticketNumber3) {
+function createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, status, errorMsg, jsonData, ticketNumber2, ticketNumber3, eventLog) {
     return new Promise((resolve, reject) => {
         let enable = process.env.EVENTLOG_ENABLE;
         if (enable != null && enable != undefined && enable.toLowerCase() == 'true') {
@@ -24,7 +22,7 @@ function createEventLog(smileId, client, ticketNumber, schemaName, eventName, ur
             if (jsonData != null && jsonData != undefined) {
                 data['JsonValue'] = JSON.stringify(jsonData, null, 2);
             }
-            arquery.createEntry(eventForm, data).then(function (result) {
+            arquery.createEntry(eventForm, data, undefined, eventLog).then(function (result) {
                 resolve(result);
             }).catch(error => {
                 reject(error);
@@ -35,12 +33,12 @@ function createEventLog(smileId, client, ticketNumber, schemaName, eventName, ur
     });
 }
 
-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 createErrorLog(smileId, client, ticketNumber, schemaName, eventName, url, errorMsg, jsonData, ticketNumber2, ticketNumber3, eventLog) {
+    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Error', errorMsg, jsonData, ticketNumber2, ticketNumber3, eventLog);
 }
 
-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 createSuccessLog(smileId, client, ticketNumber, schemaName, eventName, url, jsonData, ticketNumber2, ticketNumber3, eventLog) {
+    return createEventLog(smileId, client, ticketNumber, schemaName, eventName, url, 'Done', null, jsonData, ticketNumber2, ticketNumber3, eventLog);
 }
 
 /*

package/controller/orgdataController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');

package/controller/relatedObjectsController.js

@@ -1,13 +1,15 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const orgdata = require('../controller/orgdataController');
 const cmdbObjectController = require('../controller/cmdbobjectController');
 const ticketCiRelation = require('./ticketCIRelationController');
 const ticketController = require('./ticketController');
 const config = require('../util/config');
+const {getEventLog} = require("../util/eventLog");
 
 async function getRelatedObjects(req, res, next) {
+    const log = getEventLog(req.log, path.basename(__filename));
     log.debug('include Data', req.includeArray);
     log.debug('include Objects', req.includeObjectsList);
 

package/controller/scriptController.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEcatalog_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const adapterFoundation = require('@manyos/adapter-foundation');
 const fs = require('fs');
 const { v4 } = require('uuid');
@@ -86,7 +86,7 @@ async function executeCode(code, requestData, params, logStream, executedByScrip
         requestData,
         params,
         adapter,
-        log: globalScriptParams.log.child({script: scriptId}, true),
+        log: log.child({script: scriptId}, true),
         clientId,
         xmlParser,
         script:executeScriptByScript,

package/controller/taskController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');
@@ -315,7 +315,7 @@ function queryTasks(clientConfig, query, globalScriptParams, includeString) {
                 element.relations = {};
                 if (includeArray.includes('ciRelations')) {
                     log.debug('Read relations for task', )
-                    const relations = await ticketCIRelationController.getTicketCIRelations(element['InstanceId']);
+                    const relations = await ticketCIRelationController.getTicketCIRelations(element['InstanceId'], log);
                     element.relations.ciRelations = relations;
                 }
 

package/controller/templateController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');

package/controller/ticketCIRelationController.js

@@ -1,11 +1,12 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const CONSTANTS = require('../util/constants');
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const {getLinkCI, applyMapping} = require('../util/paramHelper');
 //const cmdbObjectController = require('./cmdbobjectController');
 const {ticketConfig} = require ('../util/config');
+const {getEventLog} = require("../util/eventLog");
 
 const utilCache = new CacheService(process.env.CACHETTL_TICKETCIRELATIONS || 600); // Create a new cache service instance
 
@@ -27,8 +28,8 @@ function getSchemaName(lookupKeyword) {
     });
 }
 
-async function getTicketCIRelations(ticketId) {
-    const relations = await getCITicketRelations(null, ticketId);
+async function getTicketCIRelations(ticketId, eventLog) {
+    const relations = await getCITicketRelations(null, ticketId, eventLog);
     if (relations && Array.isArray(relations)) {
         let x=0;
         for (x=0;x<relations.length;x++) {
@@ -43,7 +44,8 @@ async function getTicketCIRelations(ticketId) {
     return relations;
 }
 
-async function getCITicketRelations(ciInstanceId, ticketId) {
+async function getCITicketRelations(ciInstanceId, ticketId, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     let ci2ticketOnly = false;
     if (ticketId === null || ticketId === undefined) {
         ci2ticketOnly = true;
@@ -64,7 +66,7 @@ async function getCITicketRelations(ciInstanceId, ticketId) {
     }
     const form = CONSTANTS.FORM_ASSET_TICKET_ASSOC;
 
-    const result = await arquery.executeARQuery(form, null, query, ['Request ID02', 'Request ID01', 'Association Type01', 'Request Type01', 'Request Description01']);
+    const result = await arquery.executeARQuery(form, null, query, ['Request ID02', 'Request ID01', 'Association Type01', 'Request Type01', 'Request Description01'], undefined, log);
     const relations = [];
     for (const relationData of result.data) {
         let relation = {};
@@ -76,7 +78,7 @@ async function getCITicketRelations(ciInstanceId, ticketId) {
                 relationType: relationData['Association Type01']
             };
         } else {
-            const ci = await getCiByReconId(relationData['Request ID02']);
+            const ci = await getCiByReconId(relationData['Request ID02'], log);
             relation = {
                 ciId: ci['Instance Id'],
                 ciName: ci['Name'],
@@ -116,7 +118,8 @@ async function getAssocLookup(ticketForm, relationObject, assocType) {
     });
 }
 
-async function createTicketCIRelation(ticketConfig, ticketId, ciInstanceId, assocType, ticketSummary) {
+async function createTicketCIRelation(ticketConfig, ticketId, ciInstanceId, assocType, ticketSummary, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     if (ticketSummary === null || ticketSummary === undefined) {
         ticketSummary = 'summary';
     }
@@ -176,12 +179,13 @@ async function createTicketCIRelation(ticketConfig, ticketId, ciInstanceId, asso
 
     log.debug('Create CI Ticket Relation', ticketRelationFormData);
     //todo: implement impersonate
-    const ticketRelation = await arquery.createEntry(ticketRelationForm, ticketRelationFormData);
-    const assetRelation = await arquery.createEntry(CONSTANTS.FORM_ASSET_TICKET_ASSOC, assetRelationFormData);
+    const ticketRelation = await arquery.createEntry(ticketRelationForm, ticketRelationFormData, undefined, log);
+    const assetRelation = await arquery.createEntry(CONSTANTS.FORM_ASSET_TICKET_ASSOC, assetRelationFormData, undefined, log);
     return {ticketRelation, assetRelation}
 }
 
-async function createTicket2TicketRelation(ticketConfig, ticketId1, ticketConfig2, ticketId2, assocType, ticketSummary) {
+async function createTicket2TicketRelation(ticketConfig, ticketId1, ticketConfig2, ticketId2, assocType, ticketSummary, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     //todo fix request description
     if (ticketSummary === null || ticketSummary === undefined) {
         ticketSummary = 'summary';
@@ -216,13 +220,14 @@ async function createTicket2TicketRelation(ticketConfig, ticketId1, ticketConfig
 
     //todo: implement impersonate
     log.debug('Create Ticket 2 Ticket Relation', ticketRelationFormData1, ticketRelationFormData2);
-    const ticketRelation1 = await arquery.createEntry(ticketConfig.forms.assoc, ticketRelationFormData1);
-    const ticketRelation2 = await arquery.createEntry(ticketConfig2.forms.assoc, ticketRelationFormData2);
+    const ticketRelation1 = await arquery.createEntry(ticketConfig.forms.assoc, ticketRelationFormData1, undefined, log);
+    const ticketRelation2 = await arquery.createEntry(ticketConfig2.forms.assoc, ticketRelationFormData2, undefined, log);
     return {ticketRelation1, ticketRelation2}
 }
 
 
-async function deleteTicketCIRelation(ticketConfig, ticketId, ciInstanceId) {
+async function deleteTicketCIRelation(ticketConfig, ticketId, ciInstanceId, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     const ticketRelationForm = ticketConfig.forms.assoc;
     const ciData = await getCIData(ciInstanceId);
     let ticketRelationQuery = `'Request ID02'= "${ticketId}" AND 'Request ID01' = "${ciData.ReconciliationIdentity}"`;
@@ -394,7 +399,8 @@ async function getOppositeAssocTypeByCode(assocCode) {
     });
 }
 
-function doesCIRelationExists(ticketRelations, newRelation, keepCIs) {
+function doesCIRelationExists(ticketRelations, newRelation, keepCIs, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     log.debug('check for relation old', ticketRelations)
     log.debug('check for relation new', newRelation)
     const relationFound = ticketRelations.find(relation => {
@@ -431,7 +437,8 @@ function doesTicketRelationExists(ticketRelations, newRelation) {
     }
 }
 
-async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
+async function updateRelations(ticketConfig, userConfig, ticketId, relations, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     // Wenn CIs vom Löschen ausgeschlossen werden sollen, dann kann unter relations.keepCIs ein Array mit Recon/InstanceId gesetzt werden.
     log.debug('Checker', {ticketConfig, userConfig, ticketId, relations});
     // Remove Ticket Relations if task
@@ -444,7 +451,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
 
     //Check CI Relations
     if (relations && relations.ciRelations && Array.isArray(relations.ciRelations)) {
-        const existingRelations = await getTicketCIRelations(ticketId);
+        const existingRelations = await getTicketCIRelations(ticketId, log);
         log.debug('foundRelations', existingRelations);
         let x=0;
         //check for missiong relations
@@ -455,7 +462,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
                 log.debug('createRelation, already exists', relation, relationsExists);
                 if (!relationsExists) {
                     try {
-                        await createTicketCIRelation(ticketConfig, ticketId, relation.ciId, relation.relationType);
+                        await createTicketCIRelation(ticketConfig, ticketId, relation.ciId, relation.relationType, undefined, log);
                     } catch (e) {
                         errors.push(e);
                     }
@@ -466,11 +473,11 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
         if (existingRelations && Array.isArray(existingRelations)) {
             for (x=0; x<existingRelations.length; x++) {
                 const relation = existingRelations[x];
-                const shouldRelationsExists = doesCIRelationExists(relations.ciRelations, relation, relations.keepCIs);
+                const shouldRelationsExists = doesCIRelationExists(relations.ciRelations, relation, relations.keepCIs, log);
                 log.debug('deleteRelation, already exists', relation, shouldRelationsExists);
                 if (shouldRelationsExists !== true) {
                     try {
-                        await deleteTicketCIRelation(ticketConfig, ticketId, relation.ciId);
+                        await deleteTicketCIRelation(ticketConfig, ticketId, relation.ciId, log);
                     } catch (e) {
                         errors.push(e);
                     }
@@ -494,7 +501,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
                     if (ticketConfig2 === null || ticketConfig2 === undefined) {
                         throw new Error(`TicketConfig for ${relation.ticketType} not found.`);
                     }
-                    await createTicket2TicketRelation(ticketConfig, ticketId, ticketConfig2, relation.ticketId, relation.relationType);
+                    await createTicket2TicketRelation(ticketConfig, ticketId, ticketConfig2, relation.ticketId, relation.relationType, undefined, log);
                 }
             }
         }
@@ -515,6 +522,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
             }
         }
     }
+    log.error('relationErrors', errors);
     if (errors && errors.length > 0) {
         errors = errors.map(item => item.message)
     }
@@ -552,12 +560,13 @@ function getCIData(instanceId) {
     });
 }
 
-async function getCiByReconId(reconId) {
+async function getCiByReconId(reconId, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     log.debug('Search for CI', reconId);
     //get only CIs with recon
     const query = `'Reconciliation Identity'="${reconId}" AND 'Data Set Id' = "BMC.ASSET"`;
     const form = CONSTANTS.FORM_CMDB_AST_BASE;
-    const result = await arquery.executeARQuery(form, null, query, ['InstanceId', 'AssetLifecycleStatus', 'Name', 'Class Id', 'Instance Id']);
+    const result = await arquery.executeARQuery(form, null, query, ['InstanceId', 'AssetLifecycleStatus', 'Name', 'Class Id', 'Instance Id'], undefined, log);
     if (result !== null && result !== undefined && result.data !== undefined) {
         return result.data[0];
     } else {

package/controller/ticketController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');
@@ -11,15 +11,17 @@ const relationUtil = require('../util/relationUtil');
 const ticketCIRelationController = require('./ticketCIRelationController');
 const scriptController = require('./scriptController');
 const mappingUtil = require('../util/mappingUtil');
+const {getEventLog} = require("../util/eventLog");
 
 const ticketCache = new CacheService(process.env.CACHETTL_TICKETS || 0); // Create a new cache service instance
 
-function getTickets(ticketConfig, config, includeString, customOptions, globalScriptParams) {
+function getTickets(ticketConfig, config, includeString, customOptions, globalScriptParams, log) {
     let query = '1=1';
-    return queryTickets(ticketConfig, config, query, null, null, customOptions, includeString, globalScriptParams);
+    return queryTickets(ticketConfig, config, query, null, null, customOptions, includeString, globalScriptParams, log);
 }
 
-async function createTicket(ticketConfig, clientConfig, data, globalScriptParams) {
+async function createTicket(ticketConfig, clientConfig, data, globalScriptParams, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     let relationErrors;
     const scripts = clientConfig[ticketConfig.requestType].scripts.POST;
     const relations = data.relations || {}
@@ -36,19 +38,19 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
 
     const fields = mappingUtil.getFieldsForCreate(config.getMapping(requestType), mapping, clientConfig[requestType].fields)
 
-    data = mappingUtil.applyMapping2Remedy(data, mapping, clientConfig[ticketConfig.requestType].constants, fields);
+    data = mappingUtil.applyMapping2Remedy(data, mapping, clientConfig[ticketConfig.requestType].constants, fields, log);
 
     //run postScripts
     if (scripts && scripts.postMapping) {
         await scriptController.runScripts(scripts.postMapping, data, clientConfig.clientId, globalScriptParams);
     }
 
-    const result = await arquery.createEntry(ticketConfig.forms.new, data, clientConfig.options)
+    const result = await arquery.createEntry(ticketConfig.forms.new, data, clientConfig.options, log)
 
     log.debug('TicketCreateResult', result);
     const ticketCreateId = Object.values(result)[0];
     //Find change id
-    const resultInterfaceCreate = await arquery.executeARQuery(ticketConfig.forms.new, null, "'1'=\"" + ticketCreateId + "\"", ticketConfig.ticketIdField, clientConfig.options)
+    const resultInterfaceCreate = await arquery.executeARQuery(ticketConfig.forms.new, null, "'1'=\"" + ticketCreateId + "\"", ticketConfig.ticketIdField, clientConfig.options, log)
     if (resultInterfaceCreate.data && Array.isArray(resultInterfaceCreate.data) && resultInterfaceCreate.data.length && resultInterfaceCreate.data[0][ticketConfig.ticketIdField]) {
         const ticketId = resultInterfaceCreate.data[0][ticketConfig.ticketIdField];
         globalScriptParams.id = ticketId
@@ -58,7 +60,7 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
         if (data[ticketConfig.businessServiceReconIdField] && relations) {
             relations.keepCIs = [data[ticketConfig.businessServiceReconIdField]]
         }
-        relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, ticketId, relations);
+        relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, ticketId, relations, log);
 
     } else {
         log.error('Cannot create Ticket', resultInterfaceCreate);
@@ -72,7 +74,8 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
     return {createResult: resultInterfaceCreate, relationErrors};
 }
 
-function queryTickets(ticketConfig, clientConfig, query, mapping, customFields, customOptions, includeString, globalScriptParams) {
+function queryTickets(ticketConfig, clientConfig, query, mapping, customFields, customOptions, includeString, globalScriptParams, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     log.debug('config', ticketConfig);
     const includeArray = getIncludeArray(includeString);
     log.debug('ticketConfig.requestType', ticketConfig.requestType);
@@ -99,7 +102,7 @@ function queryTickets(ticketConfig, clientConfig, query, mapping, customFields,
     log.debug('mapping', mapping);
 
     return ticketCache.get(key, async function () {
-        const result = await arquery.executeARQuery(ticketConfig.forms.regular, baseQuery || null, query, fields.toString() || '1', options);
+        const result = await arquery.executeARQuery(ticketConfig.forms.regular, baseQuery || null, query, fields.toString() || '1', options, log);
         const globalRelationObjects = relationUtil.prepareGlobalRelationObject();
         const tickets = [];
         if (result && result.data && result.data.length) {
@@ -154,7 +157,7 @@ async function handleTicket(ticketConfig, ticket, mapping, clientConfig, include
 
     ticket.relations = {};
     if (includeArray.includes('ciRelations')) {
-        const relations = await ticketCIRelationController.getTicketCIRelations(ticket.id);
+        const relations = await ticketCIRelationController.getTicketCIRelations(ticket.id, log);
         ticket.relations.ciRelations = relations;
     }
     if (includeArray.includes('ticketRelations')) {
@@ -267,7 +270,8 @@ function checkFieldsProblem(problem, globalRelationObjects) {
 }
 
 
-async function getTicket(ticketConfig, config, id, mapping, includeString, globalScriptParams) {
+async function getTicket(ticketConfig, config, id, mapping, includeString, globalScriptParams, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     let query = '1=2';
     const requestType = ticketConfig.requestType;
     if (requestType === 'incident') {
@@ -279,12 +283,13 @@ async function getTicket(ticketConfig, config, id, mapping, includeString, globa
     } else if (requestType === 'workOrder') {
         query = `'Work Order ID'=\"${id}\"`;
     }
-    const returnValue = await queryTickets(ticketConfig, config, query, mapping, null, null, includeString, globalScriptParams);
+    const returnValue = await queryTickets(ticketConfig, config, query, mapping, null, null, includeString, globalScriptParams, log);
     const ticket =  returnValue.data[0];
     return {data: ticket, included: returnValue.included};
 }
 
-async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalScriptParams) {
+async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalScriptParams, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     let relationErrors;
     const scripts = clientConfig[ticketConfig.requestType].scripts.PUT;
     const fields = clientConfig[ticketConfig.requestType].fields
@@ -295,22 +300,21 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
         await scriptController.runScripts(scripts.preMapping, ticketData, clientConfig.clientId, globalScriptParams);
     }
 
-    log.debug(clientConfig[ticketConfig.requestType]);
+    log.debug('requestType', clientConfig[ticketConfig.requestType]);
     const myClientConfig = {};
     myClientConfig[ticketConfig.requestType] = {baseQuery: clientConfig[ticketConfig.requestType].baseQuery, fields: [1, ticketConfig.businessServiceReconIdField]};
     const myMapping = [{"oldName":ticketConfig.requestIdField, "newName" :  "internalId"}, {"oldName":ticketConfig.businessServiceReconIdField, "newName" :  "serviceReconId"}];
 
     const mapping = config.getMapping(ticketConfig.requestType);
-
     //Constants work only on new.
-    ticketData = mappingUtil.applyMapping2Remedy(ticketData, mapping, undefined, fields);
+    ticketData = mappingUtil.applyMapping2Remedy(ticketData, mapping, undefined, fields, log);
 
     //run postMapping
     if (scripts && scripts.postMapping) {
         await scriptController.runScripts(scripts.postMapping, ticketData, clientConfig.clientId, globalScriptParams);
     }
 
-    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping, undefined, globalScriptParams);
+    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping, undefined, globalScriptParams, log);
     log.debug('Ticket to Update', ticket);
     //keep businessService CI Relation
     if (ticket && ticket.data && ticket.data.serviceReconId && relations) {
@@ -321,8 +325,8 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
     delete ticketData[ticketConfig.ticketIdField];
 
     //todo Abfangen wenn getTicket nichts liefert.
-    const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData, clientConfig.options);
-    relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
+    const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData, clientConfig.options, log);
+    relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations, log);
     //run afterExecution
     if (scripts && scripts.afterExecution) {
         await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId, globalScriptParams);
@@ -330,12 +334,12 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
     return {updateResult: update, relationErrors};
 }
 
-function searchTicket(ticketConfig, clientConfig, searchString, fields, options, includeString, globalScriptParams) {
+function searchTicket(ticketConfig, clientConfig, searchString, fields, options, includeString, globalScriptParams, eventLog) {
     const mapping = config.getMapping(ticketConfig.requestType);
     const mappedString = searchUtil.applyMapping(searchString, mapping);
     const customFields = searchUtil.getCustomFields(clientConfig[ticketConfig.requestType].fields, mapping, fields);
     options.sort = searchUtil.applySortMapping(options.sort, mapping);
-    return queryTickets(ticketConfig, clientConfig, mappedString, null, customFields, options, includeString, globalScriptParams);
+    return queryTickets(ticketConfig, clientConfig, mappedString, null, customFields, options, includeString, globalScriptParams, eventLog);
 }
 
 module.exports = {

package/controller/ticketWorkLogController.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const arquery = require('../util/arquery');
 const CacheService = require ('../util/cache.service');
 const config = require('../util/config');

package/docs/releases.md

@@ -1,6 +1,9 @@
 # Release Notes
 
 ## API
+### 1.64.0 - 19.07.23
+Introduce Enhanced Logging for Tickets. More objects in later releases. 
+
 ### 1.63.0 - 10.01.23
 Security fix for jsonwebtoken https://github.com/advisories/GHSA-27h2-hvpr-p74q
 
@@ -185,6 +188,9 @@ e.g.
 */v1/incidents?impersonateUser=abc123
 
 ## Event Manager
+### 1.31.0 - 18.07.23
+Introduce advanced logging for events. Each event log record will contain details about the associated event. (e.g. Event Id, Ticketnumber, etc.)
+
 ### 1.29.1 - 10.01.23
 Security fix for jsonwebtoken https://github.com/advisories/GHSA-27h2-hvpr-p74q
 

package/package.json

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

package/routes/appConfigRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const {body, validationResult, oneOf, checkSchema} = require('express-validator/check');
 const {setEventData} = require('../controller/eventLogController');
 const CONSTANTS = require('../util/constants');

package/routes/ciRelationRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog(path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const cmdbobjects = require('../controller/cmdbobjectController');

package/routes/cmdbObjectRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, checkSchema} = require('express-validator/check');
 const cmdbobjects = require('../controller/cmdbobjectController');

package/routes/customFormRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const {body, validationResult, oneOf} = require('express-validator/check');
 const customFormController = require('../controller/customFormController');
 const eventLog = require('../controller/eventLogController');

package/routes/organisationRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const orgdata = require('../controller/orgdataController');

package/routes/peopleRelationRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const cmdbobjects = require('../controller/cmdbobjectController');

package/routes/personRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const orgdata = require('../controller/orgdataController');

package/routes/scriptRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const scriptController = require('../controller/scriptController');
 const eventLog = require('../controller/eventLogController');
 const CONSTANTS = require('../util/constants');

package/routes/supportgroupRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const passport = require('passport');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const orgdata = require('../controller/orgdataController');

package/routes/taskRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const {body, validationResult, oneOf} = require('express-validator/check');
 const task = require('../controller/taskController');
 const eventLog = require('../controller/eventLogController');

package/routes/templateRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const templateController = require('../controller/templateController');
 const eventLog = require('../controller/eventLogController');
 const CONSTANTS = require('../util/constants');

package/routes/ticketRoutes.js

@@ -1,5 +1,6 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
+const {getEventLog} = require('../util/eventLog');
 const {body, validationResult, oneOf} = require('express-validator/check');
 const ticketController = require('../controller/ticketController');
 const templateController = require('../controller/templateController');
@@ -15,7 +16,13 @@ module.exports = (function() {
         return `${location}[${param}]: ${msg}`;
     };
 
+    ticketRoutes.use(function (req, res, next) {
+        log = getEventLog(req.log, path.basename(__filename))
+        next();
+    });
+
     ticketRoutes.get('/', function (req, res, next) {
+        log = getEventLog(req.log, path.basename(__filename));
         eventLog.setEventData(
             req,
             req.parentEventBase,
@@ -46,6 +53,7 @@ module.exports = (function() {
     });
 
     ticketRoutes.post('/', function (req, res, next) {
+        log = getEventLog(req.log, path.basename(__filename));
         //todo Errorhandling prüfen. Wenn parameter fehlen, wird nicht zurückgegeben welche
         const origData = JSON.parse(JSON.stringify(req.body));
         const includeString = req.query.include;
@@ -63,7 +71,7 @@ module.exports = (function() {
             next(errors.array());
         } else {
             //const relations = req.body.data.relations;
-            ticketController.createTicket(req.ticketConfig, req.user.config, req.body.data, req.globalScriptParams).then(async function (result) {
+            ticketController.createTicket(req.ticketConfig, req.user.config, req.body.data, req.globalScriptParams, req.log).then(async function (result) {
                 const createResult = result.createResult;
                 const relationErrors = result.relationErrors;
                 if (relationErrors && Array.isArray(relationErrors) && relationErrors.length > 0) {
@@ -88,7 +96,7 @@ module.exports = (function() {
     ticketRoutes.post('/search', [
             body('searchString').isLength({ min: 1})
         ], function (req, res, next) {
-
+        log = getEventLog(req.log, path.basename(__filename));
         const origData = JSON.parse(JSON.stringify(req.body));
         const includeString = req.query.include;
         eventLog.setEventData(
@@ -119,7 +127,7 @@ module.exports = (function() {
         if (!valResult.isEmpty()) {
             next(valResult.array());
         } else {
-            ticketController.searchTicket(req.ticketConfig, req.user.config, req.body.searchString, req.body.fields, options, includeString, req.globalScriptParams).then(function (result) {
+            ticketController.searchTicket(req.ticketConfig, req.user.config, req.body.searchString, req.body.fields, options, includeString, req.globalScriptParams, req.log).then(function (result) {
                 log.debug('result', result);
                 req.includeObjectsList = result.included;
                 req.result = {data:result.data};
@@ -146,8 +154,9 @@ module.exports = (function() {
     });
 
     function getTicket(req, res, next, clientConfig, id, mapping, includeString, additionalData) {
+        log = getEventLog(req.log, path.basename(__filename));
         req.globalScriptParams.id = id
-        ticketController.getTicket(req.ticketConfig, clientConfig, id, mapping, includeString, req.globalScriptParams).then(function (result) {
+        ticketController.getTicket(req.ticketConfig, clientConfig, id, mapping, includeString, req.globalScriptParams, log).then(function (result) {
             log.debug('result', result);
             req.includeObjectsList = result.included;
             req.result = {data:result.data || {}};
@@ -164,6 +173,7 @@ module.exports = (function() {
     }
 
     ticketRoutes.put('/:id', function (req, res, next) {
+        log = getEventLog(req.log, path.basename(__filename));
         const id = req.params.id;
         req.globalScriptParams.id = id
         const origData = JSON.parse(JSON.stringify(req.body));
@@ -182,7 +192,7 @@ module.exports = (function() {
             next(errors.array());
         } else {
             const relations = req.body.data.relations;
-            ticketController.updateTicket(req.ticketConfig, req.user.config, id, req.body.data, req.globalScriptParams)
+            ticketController.updateTicket(req.ticketConfig, req.user.config, id, req.body.data, req.globalScriptParams, log)
                 .then(async function (result) {
                     const relationErrors = result.relationErrors;
                     if (relationErrors && Array.isArray(relationErrors) && relationErrors.length > 0) {

package/routes/ticketWorkLogRoutes.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const {body, validationResult, oneOf} = require('express-validator/check');
 const ticketWorkLogController = require('../controller/ticketWorkLogController');
 const ticketValidationUtil = require('../util/ticketValidationUtil');

package/test/changeTest.js

@@ -209,7 +209,7 @@ describe('Integration Tests - Change', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })
@@ -232,7 +232,7 @@ describe('Integration Tests - Change', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })

package/test/incidentTest.js

@@ -158,7 +158,7 @@ describe('Integration Tests - Incidents', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })
@@ -181,7 +181,7 @@ describe('Integration Tests - Incidents', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })

package/test/problemTest.js

@@ -181,7 +181,7 @@ describe('Integration Tests - Problems', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })
@@ -204,7 +204,7 @@ describe('Integration Tests - Problems', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })

package/test/workorderTest.js

@@ -199,7 +199,7 @@ describe('Integration Tests - Workorders', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })
@@ -222,7 +222,7 @@ describe('Integration Tests - Workorders', function () {
                         }
                     })
                 .end(function(err, res) {
-                    res.should.have.status(500);
+                    res.should.have.status(422);
                     done();
                 })
         })

package/util/arquery.js

@@ -1,7 +1,8 @@
 require('dotenv').config();
 const request = require('request-promise-native');
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const {getEventLog} = require("./eventLog");
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 async function deleteEntries(form, baseQuery, query) {
     let fullQuery = query;
@@ -36,7 +37,9 @@ async function deleteEntries(form, baseQuery, query) {
     return value;
 }
 
-async function executeARQuery(form, baseQuery, query, fields, options) {
+async function executeARQuery(form, baseQuery, query, fields, options, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
+    log = log.child({form});
     let fullQuery = query;
     if (baseQuery)
         fullQuery = "(" + baseQuery + ") AND " + query;
@@ -178,7 +181,9 @@ function prepareSortString(sortOptions) {
 }
 
 //todo add impersonate
-function createEntry(form, entryData, clientOptions) {
+function createEntry(form, entryData, clientOptions, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
+    log = log.child({form});
     let port = 0;
     if (process.env.AR_PORT && process.env.AR_PORT != undefined)
         port = process.env.AR_PORT;
@@ -362,7 +367,9 @@ function applyMapping(entryData, mapping, constants) {
     return entryData;
 }
 
-function updateEntry(form, id, entryData, clientOptions) {
+function updateEntry(form, id, entryData, clientOptions, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
+    log = log.child({form});
     let port = 0;
     if (process.env.AR_PORT && process.env.AR_PORT != undefined)
         port = process.env.AR_PORT;
@@ -405,7 +412,11 @@ function updateEntry(form, id, entryData, clientOptions) {
                     }
                 }
                 //TODO check for status and reject if Error
-                resolve(response);
+                if (response && response.startsWith('[message:error')) {
+                    reject ('Could not update entry: ' + response);
+                } else {
+                    resolve(response);
+                }
             })
             .catch(function (error) {
                 log.error(error);

package/util/auth.js

@@ -1,6 +1,6 @@
 require('dotenv').config();
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 function isAuthorizedAdmin(req, res, next) {
     log.debug(req.user);

package/util/cache.service.js

@@ -1,6 +1,6 @@
 const NodeCache = require ('node-cache/index');
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 class Cache {
 

package/util/config.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const fsPromises = require('fs').promises;
 
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 const clientConfigFile = 'conf/clients.json';
 const arquery = require('../util/arquery');

package/util/eventLog.js

@@ -0,0 +1,16 @@
+const path = require("path");
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
+
+function getEventLog(eventLog, file, options) {
+    if (!eventLog) {
+        eventLog = log;
+    }
+    eventLog = eventLog.child({
+        file
+    });
+    return eventLog;
+}
+
+module.exports = {
+    getEventLog
+};

package/util/mappingUtil.js

@@ -1,12 +1,13 @@
 const path = require('path');
 const {getFields} = require("./config");
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
-
-function applyMapping2Remedy(entryData, mapping, constants, fields) {
+const {getEventLog} = require("./eventLog");
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
+function applyMapping2Remedy(entryData, mapping, constants, fields, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     //todo add array handling
     if (!Array.isArray(entryData)) {
-        return applyMappingInternal(entryData, mapping, constants, fields);
+        return applyMappingInternal(entryData, mapping, constants, fields, log);
     } else {
         const entries = [];
         entryData.forEach(entry => {
@@ -17,7 +18,8 @@ function applyMapping2Remedy(entryData, mapping, constants, fields) {
     }
 }
 
-function applyMappingInternal(entryData, mapping, constants, fields) {
+function applyMappingInternal(entryData, mapping, constants, fields, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     Object.keys(entryData).forEach(function (objectKey) {
         const found = mapping.find(function(element) {
             return element.newName === objectKey;
@@ -105,7 +107,8 @@ function getFieldsForCreate(mapping, mappingNew, clientFields) {
     return remedyField;
 }*/
 
-function applyCustomFormMapping(object, mapping, requestIdField) {
+function applyCustomFormMapping(object, mapping, requestIdField, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     //log.debug('apply mapping', object, mapping)
     //Apply mapping
     Object.keys(mapping).forEach(remedyName => {
@@ -128,7 +131,8 @@ function applyCustomFormMapping(object, mapping, requestIdField) {
     }
 }
 
-function applyCustomFormMapping2Remedy(entryData, mapping, constants, fields) {
+function applyCustomFormMapping2Remedy(entryData, mapping, constants, fields, eventLog) {
+    log = getEventLog(eventLog, path.basename(__filename));
     //delete unmapped entries
     const mappedFields = Object.values(mapping)
 

package/util/paramHelper.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 function getIncludeArray(includeString) {
     log.debug('transform includeString', includeString);

package/util/relationUtil.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 const CONSTANTS = require('../util/constants');
 

package/util/responsehandler.js

@@ -1,6 +1,7 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+let log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 const eventLog = require('../controller/eventLogController');
+const {getEventLog} = require("./eventLog");
 
 const VERSION = process.env.version;
 
@@ -21,6 +22,7 @@ function logRequest (req, res, next) {
 }
 
 function logErrors(err, req, res, next) {
+    log = getEventLog(req.log, path.basename(__filename));
     /*log.error({
         smileId : req.smileId,
         error : err.stack || String(err)
@@ -39,13 +41,15 @@ function logErrors(err, req, res, next) {
             JSON.stringify(err, null, 2) || String(err),
             eventData.jsonData,
             eventData.ticketNumber2,
-            eventData.ticketNumber3);
+            eventData.ticketNumber3,
+            req.log);
     }
 
     next(err);
 }
 
 function errorHandler(err, req, res, next) {
+    log = getEventLog(req.log, path.basename(__filename));
     const errorStack = err.stack;
     const errorStatus = err.status || req.errorStatus || 500;
     if (errorStatus == 401) {
@@ -66,6 +70,7 @@ function errorHandler(err, req, res, next) {
 
 //createSuccessLog(client, ticketNumber, schemaName, eventName, url, jsonData) {
 function eventQueueHandler(req, res, next) {
+    log = getEventLog(req.log, path.basename(__filename));
     //add version to header as debug info
     res.setHeader('x-smileconnect-version', VERSION || '0.0.0');
     log.debug({req:req}, 'start');
@@ -93,7 +98,10 @@ function eventQueueHandler(req, res, next) {
             eventData.event,
             req.method + ':' + req.url,
             eventData.jsonData,
-            eventData.ticketNumber2).then( success => {
+            eventData.ticketNumber2,
+            eventData.ticketNumber3,
+            req.log
+            ).then( success => {
                 if (req.downloadResult) {
                     res.set('Content-disposition', 'attachment; filename=' + req.downloadResult.fileName);
                     res.status(200).send(req.downloadResult.data);

package/util/searchUtil.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 function applyMapping(searchString, mapping) {
     log.debug('Apply mapping on', searchString, mapping);

package/util/ticketValidationUtil.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const ticketController = require("../controller/ticketController");
-const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(__filename));
+const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
 
 async function checkTicket(ticketConfig, id, globalScriptParams) {

package/screwdriver.yaml

@@ -1,52 +0,0 @@
-# Shared definition block
-shared:
-  # Source: https://hub.docker.com/r/library/buildpack-deps/
-  image: node:10
-  secrets:
-    - SCM_ACCESS_TOKEN
-    - SCM_USERNAME
-# Job definition block
-jobs:
-  test:
-    requires: [~pr, ~commit]
-    # Steps definition block.
-    environment:
-      SSO_ISSUER: https://sso.manyos.it/auth/realms/itsmproxy
-      SSO_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6LRzGvjoxuHGnA4MT8D73O/GMSA1hJz1syqsBJY+F2OZRcKz/+gEnlnB3EPAxF7Luoz4nFh1Aaz21DkN2bL8W544+MV4JGl61f4N5HAnBT1635rN5xkbubgmuNQCnKKFu7OlAD3QxiDwecg1bJvFhJW9Qj5YhOwGuX5/4sOSCjmdTcKT1mCHL61FJ5mzxtbrct97zVwXmi4F4KDKj2PsW+qxUg0Jz/06iTVjtv2H1yBq16tqvCyq9WR6nZELmSsDNyyiTuKGJeiF+LXfIjtI9WZgPTGvIWQ3RIqObBm50bEBLHL5aHm2iSGDKoSMOGf/3aQ5NnZEgjMNdkTEjkWVQIDAQAB
-      BASEURL: https://rapi.port.manyos.io
-      AR_SERVER: pier1
-      AR_PORT: 9502
-      LOGLEVEL: debug
-      EVENTLOG_ENABLE: false
-    steps:
-      - init: npm install
-      - runtest: npm test
-      - generate-artifacts: find ./artifacts -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
-      - copy-to-artifacts-dir: echo $SD_ARTIFACTS_DIR && cp -r ./artifacts $SD_ARTIFACTS_DIR
-    secrets:
-      - TEST_ID
-      - TEST_SECRET
-      - AR_USER
-      - AR_PASSWORD
-
-#  test:
-#    requires: [main] # second_job will run after main job is done
-#    environment:
-#      - SSO_ISSUER: https://sso.manyos.it/auth/realms/itsmproxy
-#      - SSO_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6LRzGvjoxuHGnA4MT8D73O/GMSA1hJz1syqsBJY+F2OZRcKz/+gEnlnB3EPAxF7Luoz4nFh1Aaz21DkN2bL8W544+MV4JGl61f4N5HAnBT1635rN5xkbubgmuNQCnKKFu7OlAD3QxiDwecg1bJvFhJW9Qj5YhOwGuX5/4sOSCjmdTcKT1mCHL61FJ5mzxtbrct97zVwXmi4F4KDKj2PsW+qxUg0Jz/06iTVjtv2H1yBq16tqvCyq9WR6nZELmSsDNyyiTuKGJeiF+LXfIjtI9WZgPTGvIWQ3RIqObBm50bEBLHL5aHm2iSGDKoSMOGf/3aQ5NnZEgjMNdkTEjkWVQIDAQAB
-#      - BASEURL: https://rapi.port.manyos.io
-#      - AR_SERVER: pier1
-#      - AR_PORT: 9502
-#      - LOGLEVEL: debug
-#      - EVENTLOG_ENABLE: false
-#    steps:
-#      - install: npm install
-#      - build: npm test
-#      - get-metadata: meta get example
-#    secrets:
-#      - SCM_ACCESS_TOKEN
-#      - SCM_USERNAME
-#      - TEST_ID
-#      - TEST_USERNAME
-#      - AR_USER
- #     - AR_PASSWORD