@manyos/smileconnect-api 1.59.2 → 1.59.4

package/app.js

@@ -371,6 +371,7 @@ app.use('/v1/:requestType/:parentId/tasks', function(req, res, next) {
 }, taskRoutes);
 
 app.use(relatedObjectsController.getRelatedObjects);
+app.use(relatedObjectsController.addLinks);
 
 app.use(responseHandler.eventQueueHandler);
 

package/conf/clients.json

@@ -2289,7 +2289,9 @@
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
             "afterExecution": []
           },
           "POST": {
@@ -2376,14 +2378,18 @@
             "preMapping": [
               "p2"
             ],
-            "postMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
             "afterExecution": [
               "INC_CreateWorklog_OnCreate"
             ]
           },
           "PUT": {
             "preMapping": [],
-            "postMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
             "afterExecution": []
           }
         }
@@ -2491,7 +2497,15 @@
           }
         ],
         "basequery": "",
-        "scripts": {},
+        "scripts": {
+          "POST": {
+            "preMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
+            "afterExecution": []
+          }
+        },
         "attachmentScripts": {}
       },
       "problemWorklog": {
@@ -2562,7 +2576,22 @@
             "value": "1000"
           }
         ],
-        "scripts": {}
+        "scripts": {
+          "POST": {
+            "preMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
+            "afterExecution": []
+          },
+          "PUT": {
+            "preMapping": [],
+            "postMapping": [
+              "notFetchResult"
+            ],
+            "afterExecution": []
+          }
+        }
       },
       "taskWorklog": {
         "fields": [

package/controller/customFormController.js

@@ -155,7 +155,11 @@ async function handleRecord(formConfig, record, mapping, clientConfig, includeAr
 
 async function getRecord(formConfig, clientConfig, id, mapping, includeString, globalScriptParams) {
     const idField = getIdField(formConfig)
-    const query = `'${idField}'=\"${id}\"`;
+    let query = `'${idField}'=\"${id}\"`;
+    if (globalScriptParams.recordQuery) {
+        query = globalScriptParams.recordQuery;
+        log.debug('Set custom record query to', globalScriptParams.recordQuery);
+    }
     const returnValue = await queryRecords(formConfig, clientConfig, query, mapping, null, {limit:1}, includeString, globalScriptParams);
     const record =  returnValue.data[0];
     return {data: record};

package/controller/relatedObjectsController.js

@@ -10,6 +10,7 @@ const config = require('../util/config');
 async function getRelatedObjects(req, res, next) {
     log.debug('include Data', req.includeArray);
     log.debug('include Objects', req.includeObjectsList);
+
     if (req.result && req.includeObjectsList && req.includeArray) {
         let result = {};
         const includedObjects = req.includeObjectsList;
@@ -195,6 +196,29 @@ function replaceObjectKeys(item) {
     }
 }
 
+async function addLinks(req, res, next) {
+    if (!req.globalScriptParams) {
+        req.globalScriptParams = {};
+    }
+    const id = req.globalScriptParams.id2 || req.globalScriptParams.id;
+    const urlStart = req.url.split('?')[0];
+    if (req.result && id) {
+        let selfUrl = '';
+        if (urlStart.endsWith(id)) {
+            selfUrl = urlStart;
+        } else {
+            selfUrl = urlStart + '/' + id;
+        }
+        req.result.links = {
+            self: {
+                id: id,
+                href: selfUrl
+            }
+        }
+    }
+    next();
+}
+
 module.exports = {
-    getRelatedObjects
+    getRelatedObjects, addLinks
 }

package/controller/ticketCIRelationController.js

@@ -440,7 +440,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
     }
 
     //Set error array
-    const errors = [];
+    let errors = [];
 
     //Check CI Relations
     if (relations && relations.ciRelations && Array.isArray(relations.ciRelations)) {
@@ -515,6 +515,9 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
             }
         }
     }
+    if (errors && errors.length > 0) {
+        errors = errors.map(item => item.message)
+    }
     return errors;
 }
 

package/controller/ticketController.js

@@ -20,6 +20,7 @@ function getTickets(ticketConfig, config, includeString, customOptions, globalSc
 }
 
 async function createTicket(ticketConfig, clientConfig, data, globalScriptParams) {
+    let relationErrors;
     const scripts = clientConfig[ticketConfig.requestType].scripts.POST;
     const relations = data.relations || {}
     //run preScripts
@@ -57,11 +58,7 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
         if (data[ticketConfig.businessServiceReconIdField] && relations) {
             relations.keepCIs = [data[ticketConfig.businessServiceReconIdField]]
         }
-        const relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, ticketId, relations);
-        if (relationErrors && relationErrors.length > 0) {
-            log.error(relationErrors)
-            throw relationErrors;
-        }
+        relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, ticketId, relations);
 
     } else {
         log.error('Cannot create Ticket', resultInterfaceCreate);
@@ -72,7 +69,7 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
     if (scripts && scripts.afterExecution) {
         await scriptController.runScripts(scripts.afterExecution, data, clientConfig.clientId, globalScriptParams);
     }
-    return resultInterfaceCreate;
+    return {createResult: resultInterfaceCreate, relationErrors};
 }
 
 function queryTickets(ticketConfig, clientConfig, query, mapping, customFields, customOptions, includeString, globalScriptParams) {
@@ -127,7 +124,8 @@ async function handleTicket(ticketConfig, ticket, mapping, clientConfig, include
         scripts = allScripts.GET || [];
     }
 
-    globalScriptParams.id = ticket[ticketConfig.requestIdField]
+    //TODO: Check if needed
+    //globalScriptParams.id = ticket[ticketConfig.requestIdField]
 
     const requestType = ticketConfig.requestType;
     if (requestType === 'incident') {
@@ -287,6 +285,7 @@ async function getTicket(ticketConfig, config, id, mapping, includeString, globa
 }
 
 async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalScriptParams) {
+    let relationErrors;
     const scripts = clientConfig[ticketConfig.requestType].scripts.PUT;
     const fields = clientConfig[ticketConfig.requestType].fields
     const relations = ticketData.relations || {}
@@ -310,7 +309,6 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
     if (scripts && scripts.postMapping) {
         await scriptController.runScripts(scripts.postMapping, ticketData, clientConfig.clientId, globalScriptParams);
     }
-
     const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping, undefined, globalScriptParams);
     log.debug('Ticket to Update', ticket);
     //keep businessService CI Relation
@@ -319,17 +317,12 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
     }
     //todo Abfangen wenn getTicket nichts liefert.
     const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData, clientConfig.options);
-    const relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
-    if (relationErrors && relationErrors.length > 0) {
-        log.error(relationErrors)
-        throw relationErrors;
-    }
+    relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
     //run afterExecution
     if (scripts && scripts.afterExecution) {
         await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId, globalScriptParams);
     }
-
-    return update;
+    return {updateResult: update, relationErrors};
 }
 
 function searchTicket(ticketConfig, clientConfig, searchString, fields, options, includeString, globalScriptParams) {

package/controller/ticketWorkLogController.js

@@ -49,6 +49,9 @@ async function createWorklog(ticketConfig, clientConfig, ticketId, data, globalS
         )
     }
 
+    //todo Hier prüfen ob das Ticket existiert
+
+
     const clientConstants = clientConfig[ticketConfig.requestTypeWorkLog].constants;
     const viewAccessConstant = clientConstants.find(element => element.name === "View Access")
     //run only if isPublic is set and no Constant is defined

package/docs/configuration/config.md

@@ -249,6 +249,18 @@ Sample:
 
 *AR_PASSWORD=password*
 
+### BASEQUERY
+
+Allows advanced control of the events that are handled by this Event Manager Engine.
+
+e.g. Add a delay before events are processed
+
+*BASEQUERY='Create Date' + 60 < $TIMESTAMP$*
+
+e.g. Handle specific client events only
+
+*BASEQUERY='VendorID' = "abc123"*
+
 ## SSO Connection
 
 For a minimum configuration only the SSO Public Key is required.

package/docs/releases.md

@@ -1,7 +1,7 @@
 # Release Notes
 
 ## API
-### 1.59.2 - 10.06.22
+### 1.59.3 - 10.06.22
 Collect all ciTicketRelationErrors and return them at the end
 
 ### 1.58.0 - 31.03.22
@@ -174,6 +174,12 @@ e.g.
 
 ## Event Manager
 
+### 1.25.0 - 13.09.22
+Improve error logging
+
+### 1.24.0 - 05.07.22
+Added baseQuery option for advanced control
+
 ### 1.22.0 - 03.03.22
 Add updateScriptReference
 

package/package.json

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

package/routes/customFormRoutes.js

@@ -63,7 +63,12 @@ module.exports = (function() {
                 const recordId = createResult;
                 eventLog.setTicketId(req, recordId);
                 req.eventData.ticketNumber = recordId;
-                getRecord(req, res, next, req.user.config, recordId, null, includeString);
+                if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                    req.result = {};
+                    next()
+                } else {
+                    getRecord(req, res, next, req.user.config, recordId, null, includeString);
+                }
             }).catch(function (reason) {
                 next(reason);
             });
@@ -164,7 +169,12 @@ module.exports = (function() {
         } else {
             customFormController.updateRecord(req.formConfig, req.user.config, id, req.body.data, req.globalScriptParams)
                 .then(async function (updateResult) {
-                    getRecord(req, res, next, req.user.config, id, null, includeString);
+                    if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                        req.result = {};
+                        next()
+                    } else {
+                        getRecord(req, res, next, req.user.config, id, null, includeString);
+                    }
                 }).catch(function (reason) {
                 next(reason);
             });

package/routes/taskRoutes.js

@@ -76,13 +76,18 @@ module.exports = (function () {
                         log.debug('Add ciRelations to task', taskId, taskInstanceId, relations)
                         await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, taskInstanceId, relations);
                     }
-                    task.getTaskByRootRequest(req.user.config, req.parentId, taskId, req.globalScriptParams, includeString).then(function (result) {
-                        req.includeObjectsList = result.included;
-                        req.result = {data:result.data || {}};
-                        next();
-                    }).catch(function (reason) {
-                        next(reason);
-                    })
+                    if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                        req.result = {};
+                        next()
+                    } else {
+                        task.getTaskByRootRequest(req.user.config, req.parentId, taskId, req.globalScriptParams, includeString).then(function (result) {
+                            req.includeObjectsList = result.included;
+                            req.result = {data: result.data || {}};
+                            next();
+                        }).catch(function (reason) {
+                            next(reason);
+                        })
+                    }
                 }
             }).catch(function (reason) {
                 next(reason);
@@ -139,13 +144,18 @@ module.exports = (function () {
                     log.debug('Add ciRelations to task', taskId, taskInstanceId, relations)
                     await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, taskInstanceId, relations);
                 }
-                task.getTaskByRootRequest(req.user.config, req.parentId, taskId, req.globalScriptParams, includeString).then(function (result) {
-                    req.includeObjectsList = result.included;
-                    req.result = {data:result.data || {}};
-                    next();
-                }).catch(function (reason) {
-                    next(reason);
-                })
+                if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                    req.result = {};
+                    next()
+                } else {
+                    task.getTaskByRootRequest(req.user.config, req.parentId, taskId, req.globalScriptParams, includeString).then(function (result) {
+                        req.includeObjectsList = result.included;
+                        req.result = {data: result.data || {}};
+                        next();
+                    }).catch(function (reason) {
+                        next(reason);
+                    })
+                }
             }).catch(function (reason) {
                 next(reason);
             });

package/routes/ticketRoutes.js

@@ -63,12 +63,22 @@ 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 (createResult) {
+            ticketController.createTicket(req.ticketConfig, req.user.config, req.body.data, req.globalScriptParams).then(async function (result) {
+                const createResult = result.createResult;
+                const relationErrors = result.relationErrors;
+                if (relationErrors && Array.isArray(relationErrors) && relationErrors.length > 0) {
+                    req.responseStatus = 422;
+                }
                 const ticketId = createResult.data[0][req.ticketConfig.ticketIdField];
                 eventLog.setTicketId(req, ticketId);
                 req.eventData.ticketNumber = ticketId;
                 //await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, ticketId, relations);
-                getTicket(req, res, next, req.user.config, ticketId, null, includeString);
+                if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                    req.result = {};
+                    next()
+                } else {
+                    getTicket(req, res, next, req.user.config, ticketId, null, includeString, {errors: {ciRelationErrors: relationErrors}});
+                }
             }).catch(function (reason) {
                 next(reason);
             });
@@ -135,12 +145,15 @@ module.exports = (function() {
 
     });
 
-    function getTicket(req, res, next, clientConfig, id, mapping, includeString) {
+    function getTicket(req, res, next, clientConfig, id, mapping, includeString, additionalData) {
         req.globalScriptParams.id = id
         ticketController.getTicket(req.ticketConfig, clientConfig, id, mapping, includeString, req.globalScriptParams).then(function (result) {
             log.debug('result', result);
             req.includeObjectsList = result.included;
             req.result = {data:result.data || {}};
+            if (additionalData) {
+                req.result = {...req.result, ...additionalData};
+            }
             if (!result.data) {
                 req.responseStatus = 404;
             }
@@ -170,9 +183,18 @@ module.exports = (function() {
         } else {
             const relations = req.body.data.relations;
             ticketController.updateTicket(req.ticketConfig, req.user.config, id, req.body.data, req.globalScriptParams)
-                .then(async function (updateResult) {
+                .then(async function (result) {
+                    const relationErrors = result.relationErrors;
+                    if (relationErrors && Array.isArray(relationErrors) && relationErrors.length > 0) {
+                        req.responseStatus = 422;
+                    }
                     //await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, id, relations);
-                    getTicket(req, res, next, req.user.config, id, null, includeString);
+                    if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                        req.result = {};
+                        next()
+                    } else {
+                        getTicket(req, res, next, req.user.config, id, null, includeString, {errors: {ciRelationErrors: relationErrors}});
+                    }
                 }).catch(function (reason) {
                 next(reason);
             });

package/routes/ticketWorkLogRoutes.js

@@ -173,10 +173,15 @@ module.exports = (function() {
                     req.globalScriptParams.id = ticketId
                     req.globalScriptParams.id2 = worklogId
                     log.debug('WorkLog created', worklogId);
-                    ticketWorkLogController.getWorklog(req.ticketConfig, req.user.config, ticketId, worklogId, undefined, req.globalScriptParams).then(worklogResult => {
-                        req.result = worklogResult;
-                        next();
-                    });
+                    if (req.globalScriptParams && req.globalScriptParams.notFetchResult && req.globalScriptParams.notFetchResult === true) {
+                        req.result = {};
+                        next()
+                    } else {
+                        ticketWorkLogController.getWorklog(req.ticketConfig, req.user.config, ticketId, worklogId, undefined, req.globalScriptParams).then(worklogResult => {
+                            req.result = worklogResult;
+                            next();
+                        });
+                    }
                 })
                 .catch(error => {
                     next(error);