@manyos/smileconnect-api 1.30.0 → 1.30.2

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/relatedObjectsController.js

@@ -4,6 +4,8 @@ const log = require('@manyos/logger').setupLog('SMILEconnect_' + path.basename(_
 const orgdata = require('../controller/orgdataController');
 const cmdbObjectController = require('../controller/cmdbobjectController');
 const ticketCiRelation = require('./ticketCIRelationController');
+const ticketController = require('./ticketController');
+const config = require('../util/config');
 
 async function getRelatedObjects(req, res, next) {
     log.debug('include Data', req.includeArray);
@@ -85,7 +87,8 @@ async function getRelatedObjects(req, res, next) {
             for (x=0; x < incidentArray.length; x++) {
                 const id = incidentArray[x];
                 log.debug('searchIncident', id);
-                const result = await incidentController.getIncident(clientConfig, id);
+                const ticketConfig = config.ticketConfig["incidents"];
+                const result = await ticketController.getTicket(ticketConfig, clientConfig, id);
                 if (result && result.data) {
                     incidents.push(result.data);
                 }
@@ -100,7 +103,8 @@ async function getRelatedObjects(req, res, next) {
             for (x=0; x < ticketIdArray.length; x++) {
                 const id = ticketIdArray[x];
                 log.debug('searchWorkOrder', id);
-                const result = await workOrderController.getWorkOrder(clientConfig, id);
+                const ticketConfig = config.ticketConfig["workorders"];
+                const result = await ticketController.getTicket(ticketConfig, clientConfig, id);
                 if (result && result.data) {
                     tickets.push(result.data);
                 }
@@ -115,7 +119,8 @@ async function getRelatedObjects(req, res, next) {
             for (x=0; x < ticketIdArray.length; x++) {
                 const id = ticketIdArray[x];
                 log.debug('searchProblem', id);
-                const result = await problemController.getProblem(clientConfig, id);
+                const ticketConfig = config.ticketConfig["problems"];
+                const result = await ticketController.getTicket(ticketConfig, clientConfig, id);
                 if (result && result.data) {
                     tickets.push(result.data);
                 }
@@ -130,7 +135,8 @@ async function getRelatedObjects(req, res, next) {
             for (x=0; x < ticketIdArray.length; x++) {
                 const id = ticketIdArray[x];
                 log.debug('searchChange', id);
-                const result = await changeController.getChange(clientConfig, id);
+                const ticketConfig = config.ticketConfig["changes"];
+                const result = await ticketController.getTicket(ticketConfig, clientConfig, id);
                 if (result && result.data) {
                     tickets.push(result.data);
                 }

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.0",
+  "version": "1.30.2",
   "description": "A proxy and abstraction layer for BMCs IT Service Management Suite",
   "main": "app.js",
   "scripts": {

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();