[client] Do not get relation id

Samuel Hassine · Samuel Hassine · commit 7657de539f92 · 2020-01-27T01:48:32.000+01:00
diff --git a/pycti/api/opencti_api_client.py b/pycti/api/opencti_api_client.py
@@ -261,7 +261,7 @@ def process_multiple(self, data):
         ):
             row = edge["node"]
             # Handle remote relation ID
-            if "relation" in edge:
+            if "relation" in edge and edge["relation"] is not None and "id" in edge["relation"]:
                 row["remote_relation_id"] = edge["relation"]["id"]
             result.append(self.process_multiple_fields(row))
         return result
diff --git a/pycti/entities/opencti_report.py b/pycti/entities/opencti_report.py
@@ -102,9 +102,6 @@ def __init__(self, opencti):
                         stix_id_key
                         entity_type
                     }
-                    relation {
-                        id
-                    }
                 }
             }
             observableRefs {
@@ -115,9 +112,6 @@ def __init__(self, opencti):
                         entity_type
                         observable_value
                     }
-                    relation {
-                        id
-                    }
                 }
             }
             relationRefs {
@@ -126,9 +120,6 @@ def __init__(self, opencti):
                         id
                         stix_id_key
                     }
-                    relation {
-                        id
-                    }
                 }
             }
         """
diff --git a/pycti/entities/opencti_stix_domain_entity.py b/pycti/entities/opencti_stix_domain_entity.py
@@ -231,9 +231,6 @@ def __init__(self, opencti, file):
                             stix_id_key
                             entity_type
                         }
-                        relation {
-                            id
-                        }
                     }
                 }
                 observableRefs {
@@ -244,9 +241,6 @@ def __init__(self, opencti, file):
                             entity_type
                             observable_value
                         }
-                        relation {
-                            id
-                        }
                     }
                 }
                 relationRefs {
@@ -255,9 +249,6 @@ def __init__(self, opencti, file):
                             id
                             stix_id_key
                         }
-                        relation {
-                            id
-                        }
                     }
                 }
             }
diff --git a/pycti/entities/opencti_stix_relation.py b/pycti/entities/opencti_stix_relation.py
@@ -39,7 +39,7 @@ def __init__(self, opencti):
                 ...on StixDomainEntity {
                     name
                     description
-                }                
+                }       
             }
             createdByRef {
                 node {

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,6 @@ def __init__(self, opencti):`
`102`	`102`	`stix_id_key`
`103`	`103`	`entity_type`
`104`	`104`	`}`
`105`		`- relation {`
`106`		`- id`
`107`		`- }`
`108`	`105`	`}`
`109`	`106`	`}`
`110`	`107`	`observableRefs {`
`@@ -115,9 +112,6 @@ def __init__(self, opencti):`
`115`	`112`	`entity_type`
`116`	`113`	`observable_value`
`117`	`114`	`}`
`118`		`- relation {`
`119`		`- id`
`120`		`- }`
`121`	`115`	`}`
`122`	`116`	`}`
`123`	`117`	`relationRefs {`
`@@ -126,9 +120,6 @@ def __init__(self, opencti):`
`126`	`120`	`id`
`127`	`121`	`stix_id_key`
`128`	`122`	`}`
`129`		`- relation {`
`130`		`- id`
`131`		`- }`
`132`	`123`	`}`
`133`	`124`	`}`
`134`	`125`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -231,9 +231,6 @@ def __init__(self, opencti, file):`
`231`	`231`	`stix_id_key`
`232`	`232`	`entity_type`
`233`	`233`	`}`
`234`		`- relation {`
`235`		`- id`
`236`		`- }`
`237`	`234`	`}`
`238`	`235`	`}`
`239`	`236`	`observableRefs {`
`@@ -244,9 +241,6 @@ def __init__(self, opencti, file):`
`244`	`241`	`entity_type`
`245`	`242`	`observable_value`
`246`	`243`	`}`
`247`		`- relation {`
`248`		`- id`
`249`		`- }`
`250`	`244`	`}`
`251`	`245`	`}`
`252`	`246`	`relationRefs {`
`@@ -255,9 +249,6 @@ def __init__(self, opencti, file):`
`255`	`249`	`id`
`256`	`250`	`stix_id_key`
`257`	`251`	`}`
`258`		`- relation {`
`259`		`- id`
`260`		`- }`
`261`	`252`	`}`
`262`	`253`	`}`
`263`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def __init__(self, opencti):`
`39`	`39`	`...on StixDomainEntity {`
`40`	`40`	`name`
`41`	`41`	`description`
`42`		`- }`
	`42`	`+ }`
`43`	`43`	`}`
`44`	`44`	`createdByRef {`
`45`	`45`	`node {`