@manyos/smileconnect-api 1.35.0 → 1.36.1

package/conf/clients.json

@@ -165,7 +165,14 @@
             "value": "Calbro Services and Weapons"
           }
         ],
-        "scripts": {}
+        "scripts": {
+          "GET": {
+            "postMapping": [
+              "script1",
+              "script2"
+            ]
+          }
+        }
       },
       "change": {
         "fields": [

package/conf/scripts/p2.js

@@ -8,5 +8,8 @@ if (remedyResult) {
 if (weatherResponse) {
     requestData.weather = await weatherResponse.json()
 }
+log.debug('testMessage')
+
+requestData.scResults = await adapter.smileconnect.getTicket('incidents', requestData.id, {clientId:'idm'})
 
 resolve();

package/conf/scripts/script2.js

@@ -1,2 +1,2 @@
-//requestData.Status = "Horstdi2";
+requestData.Status = "Horstdi2";
 resolve();

package/controller/cmdbobjectController.js

@@ -12,6 +12,7 @@ const ticketCIRelationController = require('../controller/ticketCIRelationContro
 const mappingUtil = require('../util/mappingUtil');
 const { v4 } = require('uuid');
 const CMDBOBJECT = 'cmdbobject';
+const scriptController = require('./scriptController');
 
 const cmdbCache = new CacheService(process.env.CACHETTL_CMDB || 600); // Create a new cache service instance
 const schemaCache = new CacheService(process.env.CACHETTL_SCHEMANAMES || 3600); // Create a new cache service instance
@@ -175,6 +176,15 @@ async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, include
     if (deleteClassId === true) {
         delete cmdbObject[CMDBOBJECT];
     }
+
+    const scripts = clientConfig[CMDBOBJECT].scripts.GET;
+    //const fields = clientConfig[ticketConfig.requestType].fields
+
+    //run preScripts
+    if (scripts && scripts.preMapping) {
+        await scriptController.runScripts(scripts.preMapping, cmdbObject, clientConfig.clientId);
+    }
+
     //Apply mapping
     mapping.forEach(function (mappingEntry) {
         try {
@@ -224,6 +234,11 @@ async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, include
 
     relationUtil.getRelatedObjectList(cmdbObject, includeArray, globalRelationObjects);
 
+    //run preScripts
+    if (scripts && scripts.postMapping) {
+        await scriptController.runScripts(scripts.postMapping, cmdbObject, clientConfig.clientId);
+    }
+
     return cmdbObject;
 }
 

package/controller/scriptController.js

@@ -53,14 +53,15 @@ async function executeScriptInternal(scriptId, requestData, params, executedBySc
         throw (`Script ${scriptId} does not exist!`);
     }
 
-    return executeCode(code, requestData, params, null, executedByScript, clientId);
+    return executeCode(code, requestData, params, null, executedByScript, clientId, scriptId);
 }
 
 async function executeScript(scriptId, requestData, params, clientId) {
     return executeScriptInternal(scriptId, requestData, params, false, clientId)
 }
 
-async function executeCode(code, requestData, params, logStream, executedByScript, clientId) {
+async function executeCode(code, requestData, params, logStream, executedByScript, clientId, scriptId) {
+    const log = require('@manyos/logger').setupLog('SMILEcatalog_Script_' + scriptId);
     //todo should only be added once
     /*if (logStream) {
         log.addStream(logStream);

package/controller/ticketController.js

@@ -290,9 +290,7 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData) {
     const myClientConfig = {};
     myClientConfig[ticketConfig.requestType] = {baseQuery: clientConfig[ticketConfig.requestType].baseQuery, fields: [1]};
     const myMapping = [{"oldName":ticketConfig.requestIdField, "newName" :  "internalId"}];
-    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping);
-    log.debug('Ticket to Update', ticket);
-    //todo Abfangen wenn getTicket nichts liefert.
+
     const mapping = config.getMapping(ticketConfig.requestType);
 
     //Constants work only on new.
@@ -303,6 +301,9 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData) {
         await scriptController.runScripts(scripts.postMapping, ticketData, clientConfig.clientId);
     }
 
+    const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping);
+    log.debug('Ticket to Update', ticket);
+    //todo Abfangen wenn getTicket nichts liefert.
     const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData);
 
     //run afterExecution

package/package.json

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