From 4ea6895212c4c9dbd1a06f788e03863a0279424d Mon Sep 17 00:00:00 2001
From: FrancoisGrunert <francois.grunert@filigran.io>
Date: Fri, 26 Jul 2024 15:48:28 +0200
Subject: [PATCH 1/2] [client-python] add 2 properties missing in report
 (#6947)

---
 pycti/entities/opencti_report.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pycti/entities/opencti_report.py b/pycti/entities/opencti_report.py
index f13246978..1de84b9ca 100644
--- a/pycti/entities/opencti_report.py
+++ b/pycti/entities/opencti_report.py
@@ -694,6 +694,8 @@ def create(self, **kwargs):
         created_by = kwargs.get("createdBy", None)
         objects = kwargs.get("objects", None)
         object_marking = kwargs.get("objectMarking", None)
+        object_assignee = kwargs.get("objectAssignee", None)
+        object_participant = kwargs.get("objectParticipant", None)
         object_label = kwargs.get("objectLabel", None)
         external_references = kwargs.get("externalReferences", None)
         revoked = kwargs.get("revoked", None)
@@ -733,6 +735,8 @@ def create(self, **kwargs):
                         "objectMarking": object_marking,
                         "objectLabel": object_label,
                         "objectOrganization": granted_refs,
+                        "objectAssignee": object_assignee,
+                        "objectParticipant": object_participant,
                         "objects": objects,
                         "externalReferences": external_references,
                         "revoked": revoked,
@@ -886,7 +890,14 @@ def import_from_stix2(self, **kwargs):
                 )
             if "x_opencti_content" in stix_object:
                 stix_object["content"] = stix_object["x_opencti_content"]
-
+            if "x_opencti_assignee_ids" not in stix_object:
+                stix_object["x_opencti_assignee_ids"] = (
+                    self.opencti.get_attribute_in_extension("assignee_ids", stix_object)
+                )
+            if "x_opencti_participant_ids" not in stix_object:
+                stix_object["x_opencti_participant_ids"] = (
+                    self.opencti.get_attribute_in_extension("participant_ids", stix_object)
+                )
             return self.create(
                 stix_id=stix_object["id"],
                 createdBy=(
@@ -897,6 +908,16 @@ def import_from_stix2(self, **kwargs):
                     if "object_marking_ids" in extras
                     else None
                 ),
+                objectAssignee=(
+                    stix_object["x_opencti_assignee_ids"]
+                    if "x_opencti_assignee_ids" in stix_object
+                    else None
+                ),
+                objectParticipant=(
+                    stix_object["x_opencti_participant_ids"]
+                    if "x_opencti_participant_ids" in stix_object
+                    else None
+                ),
                 objectLabel=(
                     extras["object_label_ids"] if "object_label_ids" in extras else None
                 ),

From 80c0cdec20f6d3856c4f803e23c15fd47cd089e0 Mon Sep 17 00:00:00 2001
From: Samuel Hassine <samuel.hassine@filigran.io>
Date: Sun, 28 Jul 2024 20:33:39 +0200
Subject: [PATCH 2/2] Fix formatting

---
 pycti/entities/opencti_report.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pycti/entities/opencti_report.py b/pycti/entities/opencti_report.py
index 1de84b9ca..2dd5cf563 100644
--- a/pycti/entities/opencti_report.py
+++ b/pycti/entities/opencti_report.py
@@ -896,7 +896,9 @@ def import_from_stix2(self, **kwargs):
                 )
             if "x_opencti_participant_ids" not in stix_object:
                 stix_object["x_opencti_participant_ids"] = (
-                    self.opencti.get_attribute_in_extension("participant_ids", stix_object)
+                    self.opencti.get_attribute_in_extension(
+                        "participant_ids", stix_object
+                    )
                 )
             return self.create(
                 stix_id=stix_object["id"],