Skip to content

Commit f772ac4

Browse files
authored
Merge pull request #2 from nodestream-proj/feature/meta-plugin
Rename 'name' property to id for cross plugin consistency
2 parents 8118c5e + 7a7c340 commit f772ac4

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

nodestream_plugin_meta/plugin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def render_property(
3737
) -> Node:
3838
node = Node(type=PROPERTY_TYPE)
3939
node.key_values.set_property("owner", owner.name)
40-
node.key_values.set_property("name", name)
40+
node.key_values.set_property("id", name)
4141
node.properties.set_property("type", property.type.value)
4242
node.properties.set_property("is_key", property.is_key)
4343
return node
@@ -49,13 +49,13 @@ def has_property_rel() -> Relationship:
4949

5050
def rel_by_name(name: str) -> Node:
5151
node = Node(type=REL_TYPE_TYPE, additional_types=(GRAPH_OBJECT_TYPE_TYPE,))
52-
node.key_values.set_property("name", name)
52+
node.key_values.set_property("id", name)
5353
return node
5454

5555

5656
def node_by_name(name: str) -> Node:
5757
node = Node(type=NODE_TYPE_TYPE, additional_types=(GRAPH_OBJECT_TYPE_TYPE,))
58-
node.key_values.set_property("name", name)
58+
node.key_values.set_property("id", name)
5959
return node
6060

6161

tests/test_plugin.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ def test_find_nodestream_yaml_not_found():
4242

4343

4444
def test_render_property():
45-
property_name = "name"
45+
property_name = "id"
4646
property = PropertyMetadata(is_key=True)
4747
owner = GraphObjectSchema(name="Person")
4848
node = render_property(owner, property_name, property)
4949

50-
expected_keys = {"owner": "Person", "name": "name"}
50+
expected_keys = {"owner": "Person", "id": "id"}
5151
assert node.key_values == expected_keys
5252
assert node.properties["type"] == property.type.value
5353
assert node.properties["is_key"] == property.is_key
@@ -64,26 +64,26 @@ def test_rel_by_name():
6464
node = rel_by_name(name)
6565
assert isinstance(node, Node)
6666
assert node.type == "RelationshipType"
67-
assert node.key_values["name"] == name
67+
assert node.key_values["id"] == name
6868

6969

7070
def test_node_by_name():
7171
name = "NODE_NAME"
7272
node = node_by_name(name)
7373
assert isinstance(node, Node)
7474
assert node.type == "NodeType"
75-
assert node.key_values["name"] == name
75+
assert node.key_values["id"] == name
7676

7777

7878
def test_render_node():
7979
schema = GraphObjectSchema(
80-
name="Person", properties={"name": PropertyMetadata(is_key=True)}
80+
name="Person", properties={"id": PropertyMetadata(is_key=True)}
8181
)
8282
ingestion = render_node(schema)
8383
assert isinstance(ingestion, DesiredIngestion)
84-
assert ingestion.source.key_values["name"] == "Person"
84+
assert ingestion.source.key_values["id"] == "Person"
8585
assert len(ingestion.relationships) == 1
86-
assert ingestion.relationships[0].to_node.key_values["name"] == "name"
86+
assert ingestion.relationships[0].to_node.key_values["id"] == "id"
8787

8888

8989
def test_render_relationship():
@@ -92,9 +92,9 @@ def test_render_relationship():
9292
)
9393
ingestion = render_relationship(schema)
9494
assert isinstance(ingestion, DesiredIngestion)
95-
assert ingestion.source.key_values["name"] == "FRIENDS_WITH"
95+
assert ingestion.source.key_values["id"] == "FRIENDS_WITH"
9696
assert len(ingestion.relationships) == 1
97-
assert ingestion.relationships[0].to_node.key_values["name"] == "since"
97+
assert ingestion.relationships[0].to_node.key_values["id"] == "since"
9898

9999

100100
def test_render_adjacency():
@@ -105,9 +105,9 @@ def test_render_adjacency():
105105
assert isinstance(ingestion, DesiredIngestion)
106106
assert ingestion.source.key_values["id"] == "Person_City_LIVES_IN"
107107
assert len(ingestion.relationships) == 3
108-
assert ingestion.relationships[0].to_node.key_values["name"] == "Person"
109-
assert ingestion.relationships[1].to_node.key_values["name"] == "City"
110-
assert ingestion.relationships[2].to_node.key_values["name"] == "LIVES_IN"
108+
assert ingestion.relationships[0].to_node.key_values["id"] == "Person"
109+
assert ingestion.relationships[1].to_node.key_values["id"] == "City"
110+
assert ingestion.relationships[2].to_node.key_values["id"] == "LIVES_IN"
111111

112112

113113
def test_schema_renderer_from_file_data():
@@ -135,7 +135,7 @@ def test_schema_renderer_render_schema():
135135
schema = Schema()
136136
schema.put_node_type(
137137
GraphObjectSchema(
138-
name="Person", properties={"name": PropertyMetadata(is_key=True)}
138+
name="Person", properties={"id": PropertyMetadata(is_key=True)}
139139
)
140140
)
141141
schema.put_relationship_type(

0 commit comments

Comments
 (0)