@manyos/smileconnect-api 1.52.2 → 1.52.4

package/conf/clients.json

@@ -233,7 +233,8 @@
           "Support Group ID 2",
           "Customer Person ID",
           "Requested By Person ID",
-          "Change Target Date"
+          "Change Target Date",
+          "ServiceCI_ReconID"
         ],
         "constants": [
           {

package/conf/mapping.json

@@ -157,6 +157,10 @@
     {
       "oldName": "Change Target Date",
       "newName": "changeTargetDate"
+    },
+    {
+      "oldName": "ServiceCI_ReconID",
+      "newName": "serviceReconId"
     }
   ],
   "person": [
@@ -237,6 +241,10 @@
     {
       "oldName": "Detailed Description",
       "newName": "detailedDescription"
+    },
+    {
+      "oldName": "ServiceCI_ReconID",
+      "newName": "serviceReconId"
     }
   ],
   "changeWorklog": [

package/controller/ticketCIRelationController.js

@@ -394,12 +394,23 @@ async function getOppositeAssocTypeByCode(assocCode) {
     });
 }
 
-function doesCIRelationExists(ticketRelations, newRelation) {
+function doesCIRelationExists(ticketRelations, newRelation, keepCIs) {
     log.debug('check for relation old', ticketRelations)
     log.debug('check for relation new', newRelation)
     const relationFound = ticketRelations.find(relation => {
-        return ((relation.ciId === newRelation.ciId || relation.ciId === newRelation.ciReconId || relation.ciReconId === newRelation.ciId) &&
-            relation.relationType === newRelation.relationType);
+        let found = (relation.ciId === newRelation.ciId || relation.ciId === newRelation.ciReconId || relation.ciReconId === newRelation.ciId) && relation.relationType === newRelation.relationType
+        //check keepCIs only if not found
+        log.debug('relation found', found)
+        if (!found && keepCIs && Array.isArray(keepCIs)) {
+            log.debug('keep CI check', keepCIs)
+            keepCIs.forEach(keepCI => {
+                if (newRelation.ciId === keepCI || newRelation.ciReconId === keepCI) {
+                    found = true
+                    log.debug('Relation found in Keep', keepCI, found)
+                }
+            })
+        }
+        return found
     });
     if (relationFound) {
         return true;
@@ -421,6 +432,7 @@ function doesTicketRelationExists(ticketRelations, newRelation) {
 }
 
 async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
+    // Wenn CIs vom Löschen ausgeschlossen werden sollen, dann kann unter relations.keepCIs ein Array mit Recon/InstanceId gesetzt werden.
     log.debug('Checker', {ticketConfig, userConfig, ticketId, relations});
     // Remove Ticket Relations if task
     if (ticketConfig.assocTicketType === 'Task') {
@@ -436,7 +448,7 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
         if (relations.ciRelations && Array.isArray(relations.ciRelations)) {
             for (x=0; x<relations.ciRelations.length; x++) {
                 const relation = relations.ciRelations[x];
-                const relationsExists = doesCIRelationExists(existingRelations, relation);
+                const relationsExists = doesCIRelationExists(existingRelations, relation, relations.keepCIs);
                 log.debug('createRelation, already exists', relation, relationsExists);
                 if (!relationsExists) {
                     await createTicketCIRelation(ticketConfig, ticketId, relation.ciId, relation.relationType);
@@ -447,9 +459,9 @@ async function updateRelations(ticketConfig, userConfig, ticketId, relations) {
         if (existingRelations && Array.isArray(existingRelations)) {
             for (x=0; x<existingRelations.length; x++) {
                 const relation = existingRelations[x];
-                const shouldRelationsExists = doesCIRelationExists(relations.ciRelations, relation);
+                const shouldRelationsExists = doesCIRelationExists(relations.ciRelations, relation, relations.keepCIs);
                 log.debug('deleteRelation, already exists', relation, shouldRelationsExists);
-                if (!shouldRelationsExists) {
+                if (shouldRelationsExists !== true) {
                     await deleteTicketCIRelation(ticketConfig, ticketId, relation.ciId);
                 }
             }

package/controller/ticketController.js

@@ -21,7 +21,7 @@ function getTickets(ticketConfig, config, includeString, customOptions, globalSc
 
 async function createTicket(ticketConfig, clientConfig, data, globalScriptParams) {
     const scripts = clientConfig[ticketConfig.requestType].scripts.POST;
-
+    const relations = data.relations || {}
     //run preScripts
     if (scripts && scripts.preMapping) {
         await scriptController.runScripts(scripts.preMapping, data, clientConfig.clientId);
@@ -51,6 +51,14 @@ async function createTicket(ticketConfig, clientConfig, data, globalScriptParams
     if (resultInterfaceCreate.data && Array.isArray(resultInterfaceCreate.data) && resultInterfaceCreate.data.length && resultInterfaceCreate.data[0][ticketConfig.ticketIdField]) {
         const ticketId = resultInterfaceCreate.data[0][ticketConfig.ticketIdField];
         globalScriptParams.id = ticketId
+
+        //do relation stuff here
+        //keep businessService CI Relation
+        if (data[ticketConfig.businessServiceReconIdField] && relations) {
+            relations.keepCIs = [data[ticketConfig.businessServiceReconIdField]]
+        }
+        await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, ticketId, relations);
+
     } else {
         log.error('Cannot create Ticket', resultInterfaceCreate);
         throw({message: 'Cannot create Ticket', details : resultInterfaceCreate});
@@ -275,6 +283,7 @@ async function getTicket(ticketConfig, config, id, mapping, includeString, globa
 async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalScriptParams) {
     const scripts = clientConfig[ticketConfig.requestType].scripts.PUT;
     const fields = clientConfig[ticketConfig.requestType].fields
+    const relations = ticketData.relations || {}
 
     //run preScripts
     if (scripts && scripts.preMapping) {
@@ -283,8 +292,8 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
 
     log.debug(clientConfig[ticketConfig.requestType]);
     const myClientConfig = {};
-    myClientConfig[ticketConfig.requestType] = {baseQuery: clientConfig[ticketConfig.requestType].baseQuery, fields: [1]};
-    const myMapping = [{"oldName":ticketConfig.requestIdField, "newName" :  "internalId"}];
+    myClientConfig[ticketConfig.requestType] = {baseQuery: clientConfig[ticketConfig.requestType].baseQuery, fields: [1, ticketConfig.businessServiceReconIdField]};
+    const myMapping = [{"oldName":ticketConfig.requestIdField, "newName" :  "internalId"}, {"oldName":ticketConfig.businessServiceReconIdField, "newName" :  "serviceReconId"}];
 
     const mapping = config.getMapping(ticketConfig.requestType);
 
@@ -298,12 +307,16 @@ async function updateTicket(ticketConfig, clientConfig, id, ticketData, globalSc
 
     const ticket = await getTicket(ticketConfig, myClientConfig, id, myMapping, undefined, globalScriptParams);
     log.debug('Ticket to Update', ticket);
+    //keep businessService CI Relation
+    if (ticket && ticket.data && ticket.data.serviceReconId && relations) {
+        relations.keepCIs = [ticket.data.serviceReconId]
+    }
     //todo Abfangen wenn getTicket nichts liefert.
     const update = await arquery.updateEntry(ticketConfig.forms.regular, ticket.data.internalId, ticketData);
-
+    await ticketCIRelationController.updateRelations(ticketConfig, clientConfig, id, relations);
     //run afterExecution
     if (scripts && scripts.afterExecution) {
-        await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId);
+        await scriptController.runScripts(scripts.afterExecution, ticketData, clientConfig.clientId, globalScriptParams);
     }
 
     return update;

package/docs/releases.md

@@ -2,6 +2,12 @@
 
 ## API 
 
+### 1.52.4 - 17.11.11
+Fix issue: Keep invisible ServiceCi Relation in Tickets during CI Relation Update
+
+### 1.52.3 - 16.11.11
+Fix issue: Add globalParams to update ticket
+
 ### 1.52.2 - 16.11.11
 Fix issue: Inbound Events Names missed 'Worklog' for Task Worklogs
 

package/package.json

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

package/routes/ticketRoutes.js

@@ -62,12 +62,12 @@ module.exports = (function() {
             req.errorStatus = 422;
             next(errors.array());
         } else {
-            const relations = req.body.data.relations;
+            //const relations = req.body.data.relations;
             ticketController.createTicket(req.ticketConfig, req.user.config, req.body.data, req.globalScriptParams).then(async function (createResult) {
                 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);
+                //await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, ticketId, relations);
                 getTicket(req, res, next, req.user.config, ticketId, null, includeString);
             }).catch(function (reason) {
                 next(reason);
@@ -171,7 +171,7 @@ module.exports = (function() {
             const relations = req.body.data.relations;
             ticketController.updateTicket(req.ticketConfig, req.user.config, id, req.body.data, req.globalScriptParams)
                 .then(async function (updateResult) {
-                    await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, id, relations);
+                    //await ticketCIRelationController.updateRelations(req.ticketConfig, req.user.config, id, relations);
                     getTicket(req, res, next, req.user.config, id, null, includeString);
                 }).catch(function (reason) {
                 next(reason);

package/util/config.js

@@ -544,6 +544,7 @@ const ticketConfig = {
         "requestIdField": "Request ID",
         "requestType": "workOrder",
         "ticketIdField": "WorkOrder_ID",
+        "businessServiceReconIdField": "CI_ReconId",
         "requestTypeWorkLog": "workOrderWorklog",
         "requestTemplate": "workOrderTemplate",
         "baseURI": "/v1/workorders",
@@ -562,6 +563,7 @@ const ticketConfig = {
         "requestIdField": "Entry ID",
         "requestType": "incident",
         "ticketIdField": "Incident Number",
+        businessServiceReconIdField: "ServiceCI_ReconID",
         "requestTypeWorkLog": "incidentWorklog",
         "requestTemplate": "incidentTemplate",
         "baseURI": "/v1/incidents",
@@ -580,6 +582,7 @@ const ticketConfig = {
         "requestIdField": "Request ID",
         "requestType": "change",
         "ticketIdField": "Infrastructure Change Id",
+        businessServiceReconIdField: "ServiceCI_ReconID",
         "requestTypeWorkLog": "changeWorklog",
         "requestTemplate": "changeTemplate",
         "baseURI": "/v1/changes",
@@ -598,6 +601,7 @@ const ticketConfig = {
         "requestIdField": "Sys-Problem Investigation ID",
         "requestType": "problem",
         "ticketIdField": "Problem Investigation ID",
+        businessServiceReconIdField: "ServiceCI_ReconID",
         "requestTypeWorkLog": "problemWorklog",
         "requestTemplate": "problemTemplate",
         "baseURI": "/v1/problems",