Feature/has geometry

.github/workflows/lint-oas.yml

@@ -25,6 +25,6 @@ jobs:
         with:
           node-version: '12'
       - name: Install spectral
-        run: npm install -g @stoplight/spectral
+        run: npm install -g @stoplight/spectral@5
       - name: Run OAS linter
         run: spectral lint ./src/objecttypes/api/${{ matrix.version }}/openapi.yaml

src/objecttypes/api/serializers.py

@@ -95,6 +95,7 @@ class Meta:
             "labels",
             "createdAt",
             "modifiedAt",
+            "hasGeometry",
             "versions",
         )
         extra_kwargs = {
@@ -109,6 +110,7 @@ class Meta:
             "updateFrequency": {"source": "update_frequency"},
             "providerOrganization": {"source": "provider_organization"},
             "documentationUrl": {"source": "documentation_url"},
+            "hasGeometry": {"source": "has_geometry"},
             "createdAt": {"source": "created_at", "read_only": True},
             "modifiedAt": {"source": "modified_at", "read_only": True},
         }

src/objecttypes/api/v1/openapi.yaml

@@ -495,6 +495,12 @@ components:
           format: date
           readOnly: true
           description: Last date when the object type was modified
+        hasGeometry:
+          type: boolean
+          description: 'Shows whether the related objects have geographic coordinates.
+            If the value is ''false'' the related objects are not allowed to have
+            coordinates and the creation/update of objects with `geometry` property
+            will raise an error '
         versions:
           type: array
           items:
@@ -634,6 +640,12 @@ components:
           format: date
           readOnly: true
           description: Last date when the object type was modified
+        hasGeometry:
+          type: boolean
+          description: 'Shows whether the related objects have geographic coordinates.
+            If the value is ''false'' the related objects are not allowed to have
+            coordinates and the creation/update of objects with `geometry` property
+            will raise an error '
         versions:
           type: array
           items:

src/objecttypes/api/v2/openapi.yaml

@@ -515,6 +515,12 @@ components:
           format: date
           readOnly: true
           description: Last date when the object type was modified
+        hasGeometry:
+          type: boolean
+          description: 'Shows whether the related objects have geographic coordinates.
+            If the value is ''false'' the related objects are not allowed to have
+            coordinates and the creation/update of objects with `geometry` property
+            will raise an error '
         versions:
           type: array
           items:
@@ -694,6 +700,12 @@ components:
           format: date
           readOnly: true
           description: Last date when the object type was modified
+        hasGeometry:
+          type: boolean
+          description: 'Shows whether the related objects have geographic coordinates.
+            If the value is ''false'' the related objects are not allowed to have
+            coordinates and the creation/update of objects with `geometry` property
+            will raise an error '
         versions:
           type: array
           items:

src/objecttypes/core/admin.py

@@ -87,7 +87,7 @@ class Media:
 
 @admin.register(ObjectType)
 class ObjectTypeAdmin(admin.ModelAdmin):
-    list_display = ("name", "name_plural")
+    list_display = ("name", "name_plural", "has_geometry")
     search_fields = ("uuid",)
     inlines = [ObjectVersionInline]
 

src/objecttypes/core/migrations/0016_objecttype_has_geometry.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.24 on 2021-11-22 14:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0015_auto_20201126_2007"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="objecttype",
+            name="has_geometry",
+            field=models.BooleanField(
+                default=True,
+                help_text="Shows whether the related objects have geographic coordinates",
+                verbose_name="has geometry",
+            ),
+        ),
+    ]

src/objecttypes/core/migrations/0017_auto_20211126_1736.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.24 on 2021-11-26 16:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0016_objecttype_has_geometry"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="objecttype",
+            name="has_geometry",
+            field=models.BooleanField(
+                default=True,
+                help_text="Shows whether the related objects have geographic coordinates. If the value is 'false' the related objects are not allowed to have coordinates and the creation/update of objects with `geometry` property will raise an error ",
+                verbose_name="has geometry",
+            ),
+        ),
+    ]

src/objecttypes/core/models.py

@@ -106,6 +106,16 @@ class ObjectType(models.Model):
         auto_now=True,
         help_text=_("Last date when the object type was modified"),
     )
+    has_geometry = models.BooleanField(
+        _("has geometry"),
+        default=True,
+        help_text=_(
+            "Shows whether the related objects have geographic coordinates. "
+            "If the value is 'false' the related objects are not allowed to "
+            "have coordinates and the creation/update of objects with "
+            "`geometry` property will raise an error "
+        ),
+    )
 
     def __str__(self):
         return f"{self.name}"

src/objecttypes/tests/v1/test_objecttype_api.py

@@ -42,6 +42,7 @@ def test_get_objecttypes(self):
                 "labels": object_type.labels,
                 "createdAt": "2020-01-01",
                 "modifiedAt": "2020-01-01",
+                "hasGeometry": object_type.has_geometry,
                 "versions": [
                     f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}"
                 ],
@@ -87,6 +88,7 @@ def test_create_objecttype(self):
             "providerOrganization": "tree provider",
             "documentationUrl": "http://example.com/doc/trees",
             "labels": {"key1": "value1"},
+            "hasGeometry": False,
         }
 
         response = self.client.post(url, data)
@@ -113,6 +115,7 @@ def test_create_objecttype(self):
         self.assertEqual(object_type.labels, {"key1": "value1"})
         self.assertEqual(object_type.created_at, date(2020, 1, 1))
         self.assertEqual(object_type.modified_at, date(2020, 1, 1))
+        self.assertEqual(object_type.has_geometry, False)
 
     def test_update_objecttype(self):
         object_type = ObjectTypeFactory.create(

src/objecttypes/tests/v2/test_objecttype_api.py

@@ -42,6 +42,7 @@ def test_get_objecttypes(self):
                 "labels": object_type.labels,
                 "createdAt": "2020-01-01",
                 "modifiedAt": "2020-01-01",
+                "hasGeometry": object_type.has_geometry,
                 "versions": [
                     f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}"
                 ],