@manyos/smileconnect-api 1.69.1 → 1.70.0

package/app.js

@@ -1,6 +1,8 @@
 
 const app = require('express')();
 
+require('dotenv').config();
+
 const path = require('path');
 const log = require('@manyos/logger').setupLog('SMILEconnect', path.basename(__filename));
 
@@ -57,8 +59,6 @@ https.globalAgent.maxSockets = maxHTTPSockets;
 
 log.info('Set max HTTP(S) Sockets to', maxHTTPSockets);
 
-require('dotenv').config();
-
 // The signals we want to handle
 // NOTE: although it is tempting, the SIGKILL signal (9) cannot be intercepted and handled
 var signals = {

package/conf/mapping.json

@@ -1025,4 +1025,4 @@
       "newName": "assigneeGroup"
     }
   ]
-}
+}

package/controller/cmdbobjectController.js

@@ -41,6 +41,7 @@ function getCmdbObjects(config, category, ciIds, includeString, options, globalS
 }
 
 function getCIRelations(clientConfig, id) {
+    log.error('Search relations with', id);
     const query = `('Source.InstanceId'=\"${id}\" OR 'Destination.InstanceId'=\"${id}\")AND('MarkAsDeleted'=$NULL$ OR 'MarkAsDeleted'=\"No\")`;
     return cmdbCache.get(query, function () {
         return new Promise((resolve, reject) => {
@@ -131,11 +132,35 @@ function queryCMDBObject(clientConfig, query, customFields, customOptions, inclu
         fields = customFields;
     }
 
+    const deleteFields = [];
+
+    const internalFieldsRequired = ['Class Id', 'Instance Id', 'Reconciliation Identity'];
+
+    internalFieldsRequired.forEach(internalRequiredField => {
+        if (!fields.includes(internalRequiredField)) {
+            fields.push(internalRequiredField);
+            deleteFields.push(internalRequiredField);
+        }
+    });
+
+    /*
     if (!fields.includes('Class Id') && includeArray.includes('classAttributes')) {
         fields.push('Class Id');
         deleteClassId = true;
         log.debug('Add classId');
+        deleteFields.push('Class Id');
+    }
+
+    if (!fields.includes('Instance Id')) {
+        fields.push('Instance Id');
+        deleteFields.push('Instance Id');
+    }
+
+    if (!fields.includes('Reconciliation Identity')) {
+        fields.push('Reconciliation Identity');
+        deleteFields.push('Reconciliation Identity');
     }
+     */
 
     const options = {
         ...clientConfig.options, ...customOptions
@@ -158,7 +183,7 @@ function queryCMDBObject(clientConfig, query, customFields, customOptions, inclu
         if (result && result.data && result.data.length) {
             let x = 0;
             for (x=0; x< result.data.length; x++) {
-                const cmdbObject = await handleCMDBObjectResult(result.data[x], mapping, clientConfig, includeArray, globalRelationObjects, deleteClassId, globalScriptParams);
+                const cmdbObject = await handleCMDBObjectResult(result.data[x], mapping, clientConfig, includeArray, globalRelationObjects, deleteFields, globalScriptParams);
                 cmdbObjects.push(cmdbObject);
             }
         }
@@ -170,12 +195,13 @@ function queryCMDBObject(clientConfig, query, customFields, customOptions, inclu
     });
 }
 
-async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, includeArray, globalRelationObjects, deleteClassId, globalScriptParams) {
-    //get class form
-    const classId = cmdbObject['Class Id'];
-    if (deleteClassId === true) {
-        delete cmdbObject[CMDBOBJECT];
-    }
+async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, includeArray, globalRelationObjects, deleteFields, globalScriptParams) {
+    const internalReconId = cmdbObject['Reconciliation Identity'];
+    const internalId = cmdbObject['Instance Id'];
+
+    deleteFields.forEach(internalRequiredField => {
+        delete cmdbObject[internalRequiredField];
+    });
 
     const scripts = clientConfig[CMDBOBJECT].scripts.GET;
     //const fields = clientConfig[ticketConfig.requestType].fields
@@ -203,30 +229,30 @@ async function handleCMDBObjectResult(cmdbObject, mapping, clientConfig, include
     cmdbObject.relations = {};
 
     if (includeArray.includes('ciRelations')) {
-        const relations = await getCIRelations(clientConfig, cmdbObject.id);
+        const relations = await getCIRelations(clientConfig, internalId);
         cmdbObject.relations.ciRelations = relations;
     }
     if (includeArray.includes('ticketRelations')) {
-        const relations = await ticketCIRelationController.getCITicketRelations(cmdbObject.id, undefined, log);
+        const relations = await ticketCIRelationController.getCITicketRelations(internalId, undefined, log);
         cmdbObject.relations.ticketRelations = relations;
     }
     if (includeArray.includes('personRelations')) {
-        const relations = await getPeopleRelations(clientConfig, cmdbObject.reconId, 'People');
+        const relations = await getPeopleRelations(clientConfig, internalReconId, 'People');
         cmdbObject.relations.personRelations = relations;
     }
 
     if (includeArray.includes('supportGroupRelations')) {
-        const relations = await getPeopleRelations(clientConfig, cmdbObject.reconId, 'Support Group');
+        const relations = await getPeopleRelations(clientConfig, internalReconId, 'Support Group');
         cmdbObject.relations.supportGroupRelations = relations;
     }
 
     if (includeArray.includes('organisationRelations')) {
-        const relations = await getPeopleRelations(clientConfig, cmdbObject.reconId, 'People Organization');
+        const relations = await getPeopleRelations(clientConfig, internalReconId, 'People Organization');
         cmdbObject.relations.organisationRelations = relations;
     }
 
     if (includeArray.includes('classAttributes')) {
-        const classAttributes = await getCMDBObjectClassAttributes(cmdbObject.id,classId, clientConfig);
+        const classAttributes = await getCMDBObjectClassAttributes(internalId, classId, clientConfig);
         cmdbObject = {
             ...cmdbObject, ...classAttributes
         }
@@ -450,4 +476,4 @@ module.exports = {
     applyMapping,
     updateCmdbObject,
     createCmdbObject
-};
+};

package/docs/releases.md

@@ -1,6 +1,9 @@
 # Release Notes
 
 ## API
+### 1.70.0 - 07.01.24
+Fixed mapping in CI Classes for Attributes Instance ID and Reconciliation ID no longer required.
+
 ### 1.69.0 - 23.07.24
 Remove unnecessary writes during config checks on startup.
 

package/package.json

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

package/util/responsehandler.js

@@ -81,7 +81,7 @@ function eventQueueHandler(req, res, next) {
             if (!eventData.jsonData) {
                 eventData.jsonData = {};
             }
-            eventData.jsonData['req'] = {
+            eventData.jsonDas= {
                 headers: req.headers,
                 body: req.body
             }
@@ -127,4 +127,4 @@ function throwSchemaError(errors) {
 
 module.exports = {
     logErrors, errorHandler, eventQueueHandler, logRequest, throwSchemaError
-};
+};