@manyos/smileconnect-api 1.59.2 → 1.59.3

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) {
@@ -287,6 +284,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 || {}
@@ -319,17 +317,13 @@ 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/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

package/package.json

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

package/routes/ticketRoutes.js

@@ -63,12 +63,17 @@ 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);
+                getTicket(req, res, next, req.user.config, ticketId, null, includeString, {errors:{ciRelationErrors:relationErrors}});
             }).catch(function (reason) {
                 next(reason);
             });
@@ -135,12 +140,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 +178,13 @@ 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);
+                    getTicket(req, res, next, req.user.config, id, null, includeString, {errors:{ciRelationErrors:relationErrors}});
                 }).catch(function (reason) {
                 next(reason);
             });