remove attribute validation boilerplate, add tests, improve tests #863
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simonLeary42
force-pushed
the
attribute-validator-boilerplate
branch
from
9233618 to
794920b
Compare
simonLeary42
commented
Oct 31, 2025
Comment on lines
-61
to
+64
| AllocationAttributeFactory( | ||
| allocation=cls.allocation, | ||
| value=100, | ||
| allocation_attribute_type=AllocationAttributeTypeFactory(name="Storage Quota (TB)"), | ||
| ) | ||
| attr_type = AAttributeTypeFactory(name="Int") | ||
| alloc_attr_type = AllocationAttributeTypeFactory(name="Storage Quota (TB)", attribute_type=attr_type) | ||
| AllocationAttributeFactory(allocation=cls.allocation, value=100, allocation_attribute_type=alloc_attr_type) |
Contributor
Author
There was a problem hiding this comment.
This was fragile. It depended on the fact that AAttributeTypeFactory has name="Int" by default.
simonLeary42
force-pushed
the
attribute-validator-boilerplate
branch
from
4b38576 to
cd29a3c
Compare
simonLeary42
commented
Oct 31, 2025
| cls.nonproject_user = UserFactory(is_staff=False, is_superuser=False) | ||
|
|
||
| attributetype = PAttributeTypeFactory(name="string") | ||
| attributetype = PAttributeTypeFactory(name="Text") |
Contributor
Author
There was a problem hiding this comment.
string is not a valid attribute type.
simonLeary42
commented
Oct 31, 2025
Comment on lines
+15
to
+36
| def _raise_if_empty(self): | ||
| if self.value == "": | ||
| raise ValidationError(f'Invalid Value "{self.value}". Value cannot be empty.') | ||
|
|
||
| def validate_int(self): | ||
| self._raise_if_empty() | ||
| try: | ||
| validate = validators.Int() | ||
| validate.to_python(self.value) | ||
| except Exception: | ||
| raise ValidationError(f"Invalid Value {self.value}. Value must be an int.") | ||
|
|
||
| def validate_float(self): | ||
| self._raise_if_empty() | ||
| try: | ||
| validate = validators.Number() | ||
| validate.to_python(self.value) | ||
| except Exception: | ||
| raise ValidationError(f"Invalid Value {self.value}. Value must be an float.") | ||
|
|
||
| def validate_yes_no(self): | ||
| self._raise_if_empty() |
Contributor
Author
There was a problem hiding this comment.
without _raise_if_empty(), validate_int(""), validate_float(""), and validate_yes_no("") all succeed.
simonLeary42
changed the title
simonLeary42
force-pushed
the
attribute-validator-boilerplate
branch
from
cd29a3c to
b4a7152
Compare
simonLeary42
force-pushed
the
attribute-validator-boilerplate
branch
from
b4a7152 to
fd428c8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
copied from
Project:coldfront/coldfront/core/project/models.py
Lines 479 to 488 in 46d0eba
I would have removed attribute validation boilerplate from
Resource, too, but it's incompatible. See #865 and #864.