[client] add draft_id header handling (opencti/6577)

Author: JeremyCloarec

pycti/api/opencti_api_client.py

@@ -213,6 +213,9 @@ def set_playbook_id_header(self, playbook_id):
     def set_event_id(self, event_id):
         self.request_headers["opencti-event-id"] = event_id
 
+    def set_draft_id(self, draft_id):
+        self.request_headers["opencti-draft-id"] = draft_id
+
     def set_synchronized_upsert_header(self, synchronized):
         self.request_headers["synchronized-upsert"] = (
             "true" if synchronized is True else "false"

pycti/utils/opencti_stix2.py

@@ -2390,7 +2390,7 @@ def import_item(
                 if item["opencti_operation"] == "delete":
                     delete_id = item["id"]
                     self.opencti.stix.delete(id=delete_id)
-                if item["opencti_operation"] == "merge":
+                elif item["opencti_operation"] == "merge":
                     target_id = item["merge_target_id"]
                     source_ids = item["merge_source_ids"]
                     self.opencti.stix.merge(id=target_id, object_ids=source_ids)