Schema as properties #42
Draft
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #42 +/- ##
==========================================
+ Coverage 95.75% 96.02% +0.27%
==========================================
Files 38 39 +1
Lines 1718 1837 +119
==========================================
+ Hits 1645 1764 +119
Misses 73 73
Continue to review full report at Codecov.
|
LePetitTim
force-pushed
the
schema_as_properties
branch
from
2297de6 to
a988774
Compare
submarcos
commented
Jan 31, 2020
geostore/models.py
Outdated
| @@ -362,6 +361,61 @@ def get_extent(self, srid=3857): | |||
| def __str__(self): | |||
| return f"{self.name}" | |||
|
|
|||
| def get_required_properties(self, schema_properties): | |||
| return [prop.slug for prop in schema_properties if prop.required] | |||
There was a problem hiding this comment.
Tu es sur une version outdated
|
|
||
| return options | ||
|
|
||
| @property |
There was a problem hiding this comment.
Suggested change
| @property | |
| @cached_property |
There was a problem hiding this comment.
Il y a d'autres choses a faire dans ce cas la. Je l'ai mis beaucoup de tests plantent
| "properties": {} | ||
| } | ||
|
|
||
| schema_properties_with_slug = schema_properties.exclude(slug__exact='') |
There was a problem hiding this comment.
Empty slugs ? Is it possible ?
There was a problem hiding this comment.
In real, it should not be possible
|
|
||
| class LayerSchemaProperty(SchemaObjectProperty): | ||
| layer = models.ForeignKey(Layer, related_name='schema_properties', on_delete=models.CASCADE) | ||
| editable = models.BooleanField(default=True) |
There was a problem hiding this comment.
Suggested change
| editable = models.BooleanField(default=True) | |
| editable = models.BooleanField(default=True, db_index=True) |
geostore/models.py
Outdated
| return f"{self.layer}: {self.slug} ({self.prop_type})" | ||
|
|
||
| def clean(self): | ||
| super(LayerSchemaProperty, self).clean() |
There was a problem hiding this comment.
Suggested change
| super(LayerSchemaProperty, self).clean() | |
| super().clean() |
|
|
||
|
|
||
| class SchemaValidationTest(APITestCase): | ||
| def setUp(self): | ||
| self.user = UserFactory(permissions=['geostore.can_manage_layers', ]) | ||
| self.client.force_authenticate(user=self.user) | ||
| self.no_schema_layer = LayerFactory(name="no schema", geom_type=None) | ||
| self.property_schema_layer = LayerFactory(name="tree") | ||
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) |
There was a problem hiding this comment.
Suggested change
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) | |
| SchemaFactory.create(title="Name", layer=self.property_schema_layer) |
geostore/tests/test_filters.py
Outdated
| ) | ||
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) | ||
| SchemaFactory.create(slug="age", title="Age", prop_type="int", layer=self.property_schema_layer) |
There was a problem hiding this comment.
Suggested change
| SchemaFactory.create(slug="age", title="Age", prop_type="int", layer=self.property_schema_layer) | |
| SchemaFactory.create(title="Age", prop_type="int", layer=self.property_schema_layer) |
geostore/tests/test_filters.py
Outdated
| ) | ||
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) |
There was a problem hiding this comment.
Suggested change
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) | |
| SchemaFactory.create(title="Name", layer=self.property_schema_layer) |
geostore/tests/test_filters.py
Outdated
| ) | ||
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) |
There was a problem hiding this comment.
Suggested change
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) | |
| SchemaFactory.create(title="Name", layer=self.property_schema_layer) |
geostore/tests/test_filters.py
Outdated
| ) | ||
| SchemaFactory.create(slug="name", title="Name", layer=self.property_schema_layer) | ||
| SchemaFactory.create(slug="age", title="Age", prop_type="int", layer=self.property_schema_layer) |
There was a problem hiding this comment.
Suggested change
| SchemaFactory.create(slug="age", title="Age", prop_type="int", layer=self.property_schema_layer) | |
| SchemaFactory.create(title="Age", prop_type="int", layer=self.property_schema_layer) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.