Skip to content

Commit f1294d9

Browse files
userlocalhostuserlocalhost
authored
Merge pull request #1248 from syucream/fix/entity-attrs-relation
Fix entity - attrs relation
2 parents 8fac8ae + 7149455 commit f1294d9

23 files changed

+388
-703
lines changed

‎acl/tests/test_view.py

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ def test_post_acl_set_attribute(self):
141141
attrbase = EntityAttr.objects.create(
142142
name="hoge", type=AttrType.OBJECT, created_user=user, parent_entity=entity
143143
)
144-
entity.attrs.add(attrbase)
145144
attr = entry.add_attribute_from_base(attrbase, user)
146145

147146
resp = self.send_set_request(attr, self._role)

‎airone/lib/test.py

-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ def create_entity(
119119
# register referral(s) EntityAttr.add_referral() supports any kind of types
120120
entity_attr.add_referral(attr_info.get("ref"))
121121

122-
entity.attrs.add(entity_attr)
123-
124122
for webhook_info in webhooks:
125123
webhook: Webhook = Webhook.objects.create(
126124
**{

‎api_v1/tests/entity/test_api.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ def setUp(self):
1515
entity = Entity.objects.create(name=entity_name, created_user=user)
1616

1717
for attrname in attrnames:
18-
entity.attrs.add(
19-
EntityAttr.objects.create(
20-
name=attrname,
21-
type=AttrType.STRING,
22-
created_user=user,
23-
parent_entity=entity,
24-
)
18+
EntityAttr.objects.create(
19+
name=attrname,
20+
type=AttrType.STRING,
21+
created_user=user,
22+
parent_entity=entity,
2523
)
2624

2725
def test_get_entity_attrs_with_invalid_entity_id(self):

‎api_v1/tests/entry/test_api.py

+18-16
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ def test_narrow_down_advanced_search_results(self):
6060

6161
for entity_index in range(0, 2):
6262
entity = Entity.objects.create(name="entity-%d" % entity_index, created_user=user)
63-
entity.attrs.add(
64-
EntityAttr.objects.create(
65-
**{
66-
"name": "attr",
67-
"type": AttrType.STRING,
68-
"created_user": user,
69-
"parent_entity": entity,
70-
}
71-
)
63+
EntityAttr.objects.create(
64+
**{
65+
"name": "attr",
66+
"type": AttrType.STRING,
67+
"created_user": user,
68+
"parent_entity": entity,
69+
}
7270
)
7371

7472
attr_ref = EntityAttr.objects.create(
@@ -80,7 +78,6 @@ def test_narrow_down_advanced_search_results(self):
8078
}
8179
)
8280
attr_ref.referral.add(ref_entry)
83-
entity.attrs.add(attr_ref)
8481

8582
for entry_index in range(0, 10):
8683
entry = Entry.objects.create(
@@ -178,8 +175,15 @@ def test_api_referred_entry(self):
178175
}
179176
)
180177
attr.referral.add(entity_ref)
181-
entity.attrs.add(attr)
182-
entity2.attrs.add(attr)
178+
attr2 = EntityAttr.objects.create(
179+
**{
180+
"name": info["name"],
181+
"type": info["type"],
182+
"created_user": user,
183+
"parent_entity": entity2,
184+
}
185+
)
186+
attr2.referral.add(entity_ref)
183187

184188
# create referred entries
185189
refs = [
@@ -429,24 +433,22 @@ def test_search_with_no_permission_entity(self):
429433
def test_search_without_is_output_all(self):
430434
user = self.guest_login()
431435
entity = Entity.objects.create(name="entity", created_user=user)
432-
entity_attr1 = EntityAttr.objects.create(
436+
EntityAttr.objects.create(
433437
**{
434438
"name": "attr1",
435439
"type": AttrType.STRING,
436440
"created_user": user,
437441
"parent_entity": entity,
438442
}
439443
)
440-
entity_attr2 = EntityAttr.objects.create(
444+
EntityAttr.objects.create(
441445
**{
442446
"name": "attr2",
443447
"type": AttrType.STRING,
444448
"created_user": user,
445449
"parent_entity": entity,
446450
}
447451
)
448-
entity.attrs.add(entity_attr1)
449-
entity.attrs.add(entity_attr2)
450452
entry = Entry.objects.create(name="entry", schema=entity, created_user=user)
451453
entry.complement_attrs(user)
452454
entry.attrs.get(schema__name="attr1").add_value(user, "value1")

‎api_v1/tests/entry/test_update_history.py

+7-11
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ def setUp(self):
9494
if info["type"] & AttrType.OBJECT:
9595
attr.referral.add(ref_entity)
9696

97-
self.entity.attrs.add(attr)
98-
9997
def test_with_fully_set_value(self):
10098
# create test entry and set each values
10199
entry = Entry.objects.create(name="entry", schema=self.entity, created_user=self.user)
@@ -236,15 +234,13 @@ def test_with_entity_params(self):
236234
# which is created in setUp method. And this test will create same name entry with
237235
# 'entry' which is created before.
238236
another_entity = Entity.objects.create(name="AnotherEntity", created_user=self.user)
239-
another_entity.attrs.add(
240-
EntityAttr.objects.create(
241-
**{
242-
"name": "str",
243-
"type": AttrType.STRING,
244-
"created_user": self.user,
245-
"parent_entity": another_entity,
246-
}
247-
)
237+
EntityAttr.objects.create(
238+
**{
239+
"name": "str",
240+
"type": AttrType.STRING,
241+
"created_user": self.user,
242+
"parent_entity": another_entity,
243+
}
248244
)
249245
another_entry = Entry.objects.create(
250246
name="entry", schema=another_entity, created_user=self.user

‎api_v1/tests/job/test_api.py

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def test_rerun_jobs(self):
9595
type=AttrType.STRING,
9696
parent_entity=entity,
9797
)
98-
entity.attrs.add(attr)
9998

10099
# make a job to create an entry
101100
entry = Entry.objects.create(name="entry", schema=entity, created_user=user)

‎api_v1/tests/test_api.py

+34-49
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,13 @@ def notify_side_effect(*args, **kwargs):
254254

255255
entity_ref = Entity.objects.create(name="Ref", created_user=user)
256256
entity = Entity.objects.create(name="Entity", created_user=user)
257-
entity.attrs.add(
258-
EntityAttr.objects.create(
259-
**{
260-
"name": "ref",
261-
"type": AttrType.OBJECT,
262-
"created_user": user,
263-
"parent_entity": entity,
264-
}
265-
)
257+
EntityAttr.objects.create(
258+
**{
259+
"name": "ref",
260+
"type": AttrType.OBJECT,
261+
"created_user": user,
262+
"parent_entity": entity,
263+
}
266264
)
267265

268266
entry_ref = Entry.objects.create(name="r1", schema=entity_ref, created_user=user)
@@ -369,8 +367,6 @@ def test_post_entry_with_invalid_params(self):
369367
if "ref" in attr_info:
370368
entity_attr.referral.add(attr_info["ref"])
371369

372-
entity.attrs.add(entity_attr)
373-
374370
# send request without essential params
375371
params = {"name": "invalid-entry", "entity": entity.name, "attrs": {}}
376372
resp = self.client.post("/api/v1/entry", json.dumps(params), "application/json")
@@ -479,16 +475,14 @@ def test_post_entry_without_permissoin(self):
479475
{"name": "attr2", "type": AttrType.STRING, "is_public": False},
480476
]
481477
for attr_info in attr_params:
482-
entity.attrs.add(
483-
EntityAttr.objects.create(
484-
**{
485-
"name": attr_info["name"],
486-
"type": attr_info["type"],
487-
"is_public": attr_info["is_public"],
488-
"created_user": admin,
489-
"parent_entity": entity,
490-
}
491-
)
478+
EntityAttr.objects.create(
479+
**{
480+
"name": attr_info["name"],
481+
"type": attr_info["type"],
482+
"is_public": attr_info["is_public"],
483+
"created_user": admin,
484+
"parent_entity": entity,
485+
}
492486
)
493487

494488
# re-login as guest
@@ -603,15 +597,13 @@ def test_update_entry(self):
603597
admin = self.admin_login()
604598

605599
entity = Entity.objects.create(name="Entity", created_user=admin, is_public=False)
606-
entity.attrs.add(
607-
EntityAttr.objects.create(
608-
**{
609-
"name": "attr",
610-
"type": AttrType.STRING,
611-
"created_user": admin,
612-
"parent_entity": entity,
613-
}
614-
)
600+
EntityAttr.objects.create(
601+
**{
602+
"name": "attr",
603+
"type": AttrType.STRING,
604+
"created_user": admin,
605+
"parent_entity": entity,
606+
}
615607
)
616608

617609
entry = Entry.objects.create(name="entry", schema=entity, created_user=admin)
@@ -791,8 +783,6 @@ def test_get_entry(self):
791783
if "referral" in info:
792784
attr.referral.add(info["referral"])
793785

794-
entity.attrs.add(attr)
795-
796786
for i in range(0, 10):
797787
entry = Entry.objects.create(name="entry-%d" % i, schema=entity, created_user=user)
798788
entry.complement_attrs(user)
@@ -943,13 +933,11 @@ def test_get_deleted_entry(self):
943933

944934
# Initialize Entity and Entries to use in this test
945935
entity = Entity.objects.create(name="Entity", created_user=user)
946-
entity.attrs.add(
947-
EntityAttr.objects.create(
948-
name="attr",
949-
type=AttrType.STRING,
950-
parent_entity=entity,
951-
created_user=user,
952-
)
936+
EntityAttr.objects.create(
937+
name="attr",
938+
type=AttrType.STRING,
939+
parent_entity=entity,
940+
created_user=user,
953941
)
954942

955943
entry = Entry.objects.create(name="entry", schema=entity, created_user=user)
@@ -1132,13 +1120,11 @@ def test_edit_entry_with_same_value(self):
11321120

11331121
# Initialize Entity and Entries to use in this test
11341122
entity = Entity.objects.create(name="Entity", created_user=user)
1135-
entity.attrs.add(
1136-
EntityAttr.objects.create(
1137-
name="attr",
1138-
type=AttrType.STRING,
1139-
parent_entity=entity,
1140-
created_user=user,
1141-
)
1123+
EntityAttr.objects.create(
1124+
name="attr",
1125+
type=AttrType.STRING,
1126+
parent_entity=entity,
1127+
created_user=user,
11421128
)
11431129

11441130
entry = Entry.objects.create(name="entry", schema=entity, created_user=user)
@@ -1190,7 +1176,6 @@ def notify_side_effect(*args, **kwargs):
11901176
"is_public": False,
11911177
}
11921178
)
1193-
entity.attrs.add(entity_attr)
11941179

11951180
# There was a bug(#28) when there are multiple users, individual attribute authorization
11961181
# would not be inherited from EntityAttr to Attribute. To confirm that the bug is corrected,
@@ -1348,13 +1333,13 @@ def test_update_entry_that_has_deleted_attribute(self):
13481333
"created_user": user,
13491334
"parent_entity": entity,
13501335
}
1351-
entity.attrs.add(EntityAttr.objects.create(**attr_params))
1336+
EntityAttr.objects.create(**attr_params)
13521337
entry = Entry.objects.create(name="entry", schema=entity, created_user=user)
13531338
entry.complement_attrs(user)
13541339

13551340
# delete and create EntityAttr, then complement Entry Attribute
13561341
entity.attrs.get(name="attr").delete()
1357-
entity.attrs.add(EntityAttr.objects.create(**attr_params))
1342+
EntityAttr.objects.create(**attr_params)
13581343
entry.complement_attrs(user)
13591344

13601345
params = {

0 commit comments

Comments
 (0)