[backend] Merge failure when merging complex multiple object (#6257)

OpenCTI-Platform · Mar 3, 2024 · 76f7a6d · 76f7a6d
1 parent c292354
commit 76f7a6d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/opencti-platform/opencti-graphql/src/database/middleware.js b/opencti-platform/opencti-graphql/src/database/middleware.js
@@ -1186,9 +1186,14 @@ const mergeEntitiesRaw = async (context, user, targetEntity, sourceEntities, tar
     // Check if we need to do something
     if (isObjectAttribute(targetFieldKey)) {
       // Special case of object that need to be merged
-      const mergedDict = R.mergeAll([...fieldValues, mergedEntityCurrentFieldValue]);
-      if (isNotEmptyField(mergedDict)) {
-        updateAttributes.push({ key: targetFieldKey, value: [mergedDict] });
+      const isObjectMultiple = isMultipleAttribute(targetType, targetFieldKey);
+      if (isObjectMultiple) {
+        updateAttributes.push({ key: targetFieldKey, value: fieldValues, operation: UPDATE_OPERATION_ADD });
+      } else {
+        const mergedDict = R.mergeAll([...fieldValues, mergedEntityCurrentFieldValue]);
+        if (isNotEmptyField(mergedDict)) {
+          updateAttributes.push({ key: targetFieldKey, value: [mergedDict] });
+        }
       }
     } else if (isMultipleAttribute(targetType, targetFieldKey)) {
       const sourceValues = fieldValues || [];