Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unique field query construction when field is nested #1435

Merged
merged 2 commits into from
Jan 25, 2021
Merged

Fix unique field query construction when field is nested #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aae415a
Fix unique field query construction when field is nested
Jan 22, 2021
90f4b3d
Rerun CI
Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions eve/io/mongo/validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,27 @@ def _is_value_unique(self, unique, field, value, query):
.. versionadded:: 0.6
"""
if unique:
schema = self.schema
attribute_path = self.document_path + (field,)
temp_path = [attribute_path[0]]

for i, path in enumerate(attribute_path[:-1]):
schema = schema[path]
if schema["type"] != "list":
temp_path.append(attribute_path[i + 1])

final_path = ".".join(temp_path)

query[final_path] = value
# In order to create the right query to check for unique values
# We need to obtain the schema path for the current field
# excluding any list fields in between.
schema = self.root_schema
document_field_path = list(self.document_path) + [field]
field_schema_path = []

while document_field_path:
current_schema_path_type = schema.get("type")
path = document_field_path.pop(0)
if current_schema_path_type == "dict":
schema = schema["schema"][path]
field_schema_path.append(path)
elif schema.get("type") == "list":
schema = schema["schema"]
else:
schema = schema[path]
field_schema_path.append(path)

query[".".join(field_schema_path)] = value
resource_config = config.DOMAIN[self.resource]

# exclude soft deleted documents if applicable
Expand Down
78 changes: 69 additions & 9 deletions eve/tests/methods/post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,17 +1020,77 @@ def test_unique_within_resource_value_different_resources(self):
self.assert201(status)

def test_unique_within_resource_in_resource_without_filter(self):
r, status = self.post(
"test_unique", data={"unique_within_resource_attribute": "unique_value"}
)
def make_payload(unique_value):
return {"unique_within_resource_attribute": unique_value}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post(
"test_unique", data={"unique_within_resource_attribute": "unique_value"}
)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post(
"test_unique", data={"unique_within_resource_attribute": "unique_value 2"}
)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def test_unique_in_root_attribute(self):
def make_payload(unique_value):
return {"unique_attribute": unique_value}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def test_unique_in_dict_attribute(self):
def make_payload(unique_value):
return {"unique_in_dict_attribute": {"unique_attribute": unique_value}}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def test_unique_in_list_attribute(self):
def make_payload(unique_value):
return {"unique_in_list_attribute": [{"unique_attribute": unique_value}]}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def test_unique_in_deep_dict_attribute(self):
def make_payload(unique_value):
return {
"unique_in_deep_dict_attribute": {
"dict_attribute": {"unique_attribute": unique_value}
}
}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def test_unique_in_deep_list_attribute(self):
def make_payload(unique_value):
return {
"unique_in_deep_list_attribute": {
"list_attribute": [{"unique_attribute": unique_value}]
}
}

r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert201(status)
r, status = self.post("test_unique", data=make_payload("unique_value"))
self.assert422(status)
r, status = self.post("test_unique", data=make_payload("unique_value_2"))
self.assert201(status)

def perform_post(self, data, valid_items=[0]):
Expand Down
41 changes: 37 additions & 4 deletions eve/tests/test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,49 @@
"datasource": {"source": "test_unique"},
"schema": {
"unique_attribute": {"type": "string", "unique": True},
"unique_in_dict_attribute": {
"type": "dict",
"schema": {"unique_attribute": {"type": "string", "unique": True}},
},
"unique_in_list_attribute": {
"type": "list",
"schema": {
"type": "dict",
"schema": {"unique_attribute": {"type": "string", "unique": True}},
},
},
"unique_in_deep_dict_attribute": {
"type": "dict",
"schema": {
"dict_attribute": {
"type": "dict",
"schema": {"unique_attribute": {"type": "string", "unique": True}},
}
},
},
"unique_in_deep_list_attribute": {
"type": "dict",
"schema": {
"list_attribute": {
"type": "list",
"schema": {
"type": "dict",
"schema": {
"unique_attribute": {"type": "string", "unique": True}
},
},
}
},
},
"unique_within_resource_attribute": {
"type": "string",
"unique_within_resource": True,
},
},
}

test_unique_nested = {"datasource": {"source": "test_unique_nested"}, "schema": {}}

credit_rules = {
"allow_unknown": True,
"schema": {
Expand All @@ -331,10 +367,7 @@

brands = {
"item_title": "brand",
"schema": {
"name": {"type": "string"},
"address": "string",
},
"schema": {"name": {"type": "string"}, "address": "string"},
}

components = {
Expand Down