@manyos/smileconnect-api 1.58.1 → 1.59.1

package/Dockerfile

@@ -1,7 +1,7 @@
 ### STAGE 1: Build ###
 
 # We label our stage as 'builder'
-FROM node:16 as builder
+FROM node:16.14 as builder
 ARG NPM_TOKEN
 COPY package.json package-lock.json ./
 

package/controller/ticketCIRelationController.js

@@ -439,6 +439,9 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
         relations.ticketRelations = undefined
     }
 
+    //Set error array
+    const errors = [];
+
     //Check CI Relations
     if (relations && relations.ciRelations && Array.isArray(relations.ciRelations)) {
         const existingRelations = await getTicketCIRelations(ticketId);
@@ -451,7 +454,11 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
                 const relationsExists = doesCIRelationExists(existingRelations, relation, relations.keepCIs);
                 log.debug('createRelation, already exists', relation, relationsExists);
                 if (!relationsExists) {
-                    await createTicketCIRelation(ticketConfig, ticketId, relation.ciId, relation.relationType);
+                    try {
+                        await createTicketCIRelation(ticketConfig, ticketId, relation.ciId, relation.relationType);
+                    } catch (e) {
+                        errors.push(e);
+                    }
                 }
             }
         }
@@ -462,7 +469,11 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
                 const shouldRelationsExists = doesCIRelationExists(relations.ciRelations, relation, relations.keepCIs);
                 log.debug('deleteRelation, already exists', relation, shouldRelationsExists);
                 if (shouldRelationsExists !== true) {
-                    await deleteTicketCIRelation(ticketConfig, ticketId, relation.ciId);
+                    try {
+                        await deleteTicketCIRelation(ticketConfig, ticketId, relation.ciId);
+                    } catch (e) {
+                        errors.push(e);
+                    }
                 }
             }
         }
@@ -504,6 +515,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
             }
         }
     }
+    return errors;
 }
 
 function getTicketConfigByTicketType(ticketType) {

package/controller/ticketController.js

@@ -315,7 +315,11 @@ 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);
-    await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
+    const relationErrors = await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
+    if (relationErrors && relationErrors.length > 0) {
+        log.error(relationErrors)
+        throw relationErrors;
+    }
     //run afterExecution
     if (scripts && scripts.afterExecution) {
         await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId, globalScriptParams);

package/docs/releases.md

@@ -1,6 +1,9 @@
 # Release Notes
 
 ## API
+### 1.59.1 - 09.06.22
+Collect all ciTicketRelationErrors and return them at the end
+
 ### 1.58.0 - 31.03.22
 Add uid() to scripts
 In customForms(create) make globalScripts.id changeable

package/package.json

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

package/routes/ticketWorkLogRoutes.js

@@ -79,16 +79,22 @@ module.exports = (function() {
             let fileContent = null;
 
             let file = null;
+
             if (req.files != null && req.files.file != null) {
                 file = req.files.file;
+            } else if (req.body.data && req.body.data.fileName && req.body.data.fileContent && req.body.data.mimetype) {
+                log.debug('set file by data content - currently not implemented');
+                //funktioniert nicht. Wahrscheinlich ein encoding problem
+                file = {
+                    name: req.body.data.fileName,
+                    data: atob(req.body.data.fileContent),
+                    mimetype: req.body.data.mimetype
+                }
             }
+
             if (file == null || file == undefined) {
-                if (req.body.data != null && req.body.data != undefined) {
-                    fileContent = req.body.data;
-                } else {
-                    req.errorStatus = 400;
-                    next({errorMessage:"No file or data send"});
-                };
+                req.errorStatus = 400;
+                next({errorMessage:"No file or data send"});
             } else {
                 //fileContent = JSON.parse(file.data);
                 ticketWorkLogController.setWorklogAttachment(req.ticketConfig, req.user.config, worklogId, file, attachmentId, req.globalScriptParams).then(

package/util/responsehandler.js

@@ -52,6 +52,13 @@ function errorHandler(err, req, res, next) {
         res.status(errorStatus).json({"error": "You are not authorized for this request.", stackTrace: errorStack});
     } else if (typeof errorStack === "string") {
         res.status(errorStatus).json({"error": "Ooops. Something unexpected just happened.", "stackTrace":errorStack});
+    } else if (Array.isArray(err)) {
+        err = err.map(item => {
+            return {
+                message: item.stack
+            }
+        })
+        res.status(errorStatus).json({"error": err});
     } else {
         res.status(errorStatus).json({"error": err});
     }