@manyos/smileconnect-api 1.30.1 → 1.31.0

package/conf/adapterConfig.js

@@ -0,0 +1,16 @@
+const adapterParams = {
+    remedy: {
+        type: "remedy",
+        arServer: env.AR_SERVER,
+        arUser: env.AR_USER,
+        arPassword: env.AR_PASSWORD,
+        arPort: env.AR_PORT,
+        rapiUri: env.BASEURL,
+        cacheTime: env.AR_CACHE_TTL || 300,
+        limitDefault: env.LIMIT_DEFAULT || 100,
+        limitMax: env.LIMIT_MAX
+    }
+};
+
+// noinspection JSAnnotator
+return adapterParams;

package/conf/clients.json

@@ -370,7 +370,7 @@
               "script2"
             ],
             "postMapping": [
-              "script3"
+              "p2"
             ],
             "afterExecution": [
               "script3"

package/conf/scripts/p2.js

@@ -1 +1,12 @@
+const weatherResponse = await fetch('https://api.openweathermap.org/data/2.5/weather?q=Klagenfurt&appid=bab78e38577c73eeb20ca872998a43dd');
+const remedyResult = await adapter.remedy.search("CTM:People", `'Remedy Login ID' = "Allen"`, "Full Name, Remedy Login ID")
+
+if (remedyResult) {
+    requestData.remedyQueryResult = remedyResult;
+}
+
+if (weatherResponse) {
+    requestData.weather = await weatherResponse.json()
+}
+
 resolve();

package/controller/cmdbobjectController.js

@@ -20,7 +20,7 @@ function getRandomId() {
     return v4();
 }
 
-function getCmdbObjects(config, category, ciIds, includeString) {
+function getCmdbObjects(config, category, ciIds, includeString, options) {
     let query = '1=1';
     if (category)
         query = `'Category' = \"${category}\"`;
@@ -36,7 +36,7 @@ function getCmdbObjects(config, category, ciIds, includeString) {
         query = query + ciQuery + ')';
         log.error('query', query);
     }
-    return queryCMDBObject(config, query, null, null, includeString);
+    return queryCMDBObject(config, query, null, options, includeString);
 }
 
 function getCIRelations(clientConfig, id) {

package/controller/scriptController.js

@@ -1,16 +1,22 @@
 const path = require('path');
 const log = require('@manyos/logger').setupLog('SMILEcatalog_' + path.basename(__filename));
-
+const adapterFoundation = require('@manyos/adapter-foundation');
 const fs = require('fs');
 
 const basePath = 'conf';
 const basePathGlobalScripts = basePath + '/scripts';
 
+const fetch = require('node-fetch');
+
 const {getClients} = require('../util/config');
 
 require('dotenv').config();
 const {NodeVM} = require('vm2');
 
+const adapterConfigScript = fs.readFileSync('conf/adapterConfig.js',{encoding: 'utf8'});
+
+const adapter = adapterFoundation.getAdapter(adapterConfigScript);
+
 //const adapter = require('../util/adapter').getAdapter();
 
 function recFindByExt(base,ext,files,result) {
@@ -69,9 +75,11 @@ async function executeCode(code, requestData, params, logStream, executedByScrip
     const sandbox = {
         requestData,
         params,
+        adapter,
         log,
         script:executeScriptByScript,
-        env: process.env
+        env: process.env,
+        fetch:fetch
     };
 
     sandbox.executedByScript = executedByScript === true;

package/controller/ticketWorkLogController.js

@@ -169,12 +169,12 @@ async function queryWorklogs(ticketConfig, clientConfig, query, mapping) {
                 const element = result.data[x];
                 //run preScripts
                 if (scripts && scripts.preMapping) {
-                    await scriptController.runScripts(scripts.preMapping, data);
+                    await scriptController.runScripts(scripts.preMapping, result.data);
                 }
                 applyMapping(element, mapping, 'Entry ID');
                 //run postScripts
                 if (scripts && scripts.postMapping) {
-                    await scriptController.runScripts(scripts.postMapping, data);
+                    await scriptController.runScripts(scripts.postMapping, result.data);
                 }
             }
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manyos/smileconnect-api",
-  "version": "1.30.1",
+  "version": "1.31.0",
   "description": "A proxy and abstraction layer for BMCs IT Service Management Suite",
   "main": "app.js",
   "scripts": {
@@ -11,6 +11,7 @@
   "author": "Robert Hannemann",
   "license": "ISC",
   "dependencies": {
+    "@manyos/adapter-foundation": "^1.1.1",
     "@manyos/logger": "^1.3.0",
     "bunyan": "^1.8.15",
     "bunyan-express-serializer": "^1.0.0",
@@ -25,6 +26,7 @@
     "moment": "^2.29.1",
     "mongoose": "^5.12.3",
     "node-cache": "^4.2.1",
+    "node-fetch": "^2.6.1",
     "only": "0.0.2",
     "p-limit": "^2.3.0",
     "passport": "^0.4.1",

package/routes/cmdbObjectRoutes.js

@@ -83,7 +83,18 @@ module.exports = (function () {
         if (typeof ciIds === 'string')
             ciIds = ciIds.split(',');
 
-        cmdbobjects.getCmdbObjects(req.user.config, category, ciIds, includeString).then(function (result) {
+        const options = {};
+        const limit = req.query.limit;
+        if (limit != null && limit != undefined) {
+            options.limit = Number.parseInt(limit);
+        }
+
+        const offset = req.query.offset;
+        if (offset != null && offset != undefined) {
+            options.offset = Number.parseInt(offset);
+        }
+
+        cmdbobjects.getCmdbObjects(req.user.config, category, ciIds, includeString, options).then(function (result) {
             log.debug('result', result);
             req.includeObjectsList = result.included;
             req.result = {data:result.data || []};

package/routes/organisationRoutes.js

@@ -108,7 +108,18 @@ module.exports = (function() {
             CONSTANTS.EVENT_ACTION_QUERY,
             CONSTANTS.FORM_ORGANISATION
         );
-        orgdata.getOrganisations(req.user.config, null, include).then(function (result) {
+        const options = {};
+        const limit = req.query.limit;
+        if (limit != null && limit != undefined) {
+            options.limit = Number.parseInt(limit);
+        }
+
+        const offset = req.query.offset;
+        if (offset != null && offset != undefined) {
+            options.offset = Number.parseInt(offset);
+        }
+
+        orgdata.getOrganisations(req.user.config, null, include, options).then(function (result) {
             req.includeObjectsList = result.included;
             req.result = {data:result.data || {}};
             next();

package/routes/ticketWorkLogRoutes.js

@@ -162,7 +162,7 @@ module.exports = (function() {
             }
             const reqPublic = req.body.data.isPublic;
             let isPublic = false;
-            if (reqPublic != null && reqPublic != undefined && reqPublic.toLowerCase() === 'true') {
+            if (reqPublic != null && reqPublic != undefined && reqPublic === true) {
                 isPublic = true;
             }