Merge pull request #78 from graphql-python/feat-polygon

feat: Support PolygonField

Author: abawchen

graphene_mongo/advanced_types.py

@@ -11,24 +11,33 @@ def _resolve_type_coordinates(self, info):
     return self['coordinates']
 
 
-class PointFieldType(graphene.ObjectType):
+class _CoordinatesField(graphene.ObjectType):
 
     type = graphene.String()
-    coordinates = graphene.List(
-        graphene.Float, resolver=_resolve_type_coordinates)
 
     def resolve_type(self, info):
         return self['type']
 
 
-class MultiPolygonFieldType(graphene.ObjectType):
+class PointFieldType(_CoordinatesField):
 
-    type = graphene.String()
     coordinates = graphene.List(
-                    graphene.List(
-                        graphene.List(
-                            graphene.List(graphene.Float))),
-                    resolver=_resolve_type_coordinates)
+        graphene.Float, resolver=_resolve_type_coordinates)
 
-    def resolve_type(self, info):
-        return self['type']
+
+class PolygonFieldType(_CoordinatesField):
+
+    coordinates = graphene.List(
+        graphene.List(
+            graphene.List(graphene.Float)),
+        resolver=_resolve_type_coordinates
+    )
+
+
+class MultiPolygonFieldType(_CoordinatesField):
+
+    coordinates = graphene.List(
+        graphene.List(
+            graphene.List(
+                graphene.List(graphene.Float))),
+        resolver=_resolve_type_coordinates)

graphene_mongo/converter.py

@@ -15,7 +15,7 @@
 
 import mongoengine
 
-from .advanced_types import PointFieldType, MultiPolygonFieldType
+from . import advanced_types
 from .utils import import_single_dispatch, get_field_description
 
 singledispatch = import_single_dispatch()
@@ -70,12 +70,17 @@ def convert_dict_to_jsonstring(field, registry=None):
 
 @convert_mongoengine_field.register(mongoengine.PointField)
 def convert_point_to_field(field, register=None):
-    return Field(PointFieldType)
+    return Field(advanced_types.PointFieldType)
+
+
+@convert_mongoengine_field.register(mongoengine.PolygonField)
+def convert_polygon_to_field(field, register=None):
+    return Field(advanced_types.PolygonFieldType)
 
 
 @convert_mongoengine_field.register(mongoengine.MultiPolygonField)
 def convert_multipolygon_to_field(field, register=None):
-    return Field(MultiPolygonFieldType)
+    return Field(advanced_types.MultiPolygonFieldType)
 
 
 @convert_mongoengine_field.register(mongoengine.DateTimeField)

graphene_mongo/tests/models.py

@@ -5,8 +5,8 @@
 from mongoengine.fields import (
     DateTimeField, EmailField, EmbeddedDocumentField,
     FloatField, EmbeddedDocumentListField, ListField, LazyReferenceField,
-    MapField, PointField, ReferenceField, StringField,
-    MultiPolygonField
+    MapField, MultiPolygonField, PointField, PolygonField,
+    ReferenceField, StringField,
 )
 
 connect('graphene-mongo-test', host='mongomock://localhost', alias='default')
@@ -98,6 +98,7 @@ class CellTower(Document):
         'collection': 'test_cell_tower',
     }
     code = StringField()
+    base = PolygonField()
     coverage_area = MultiPolygonField()
 
 

graphene_mongo/tests/setup.py

@@ -104,13 +104,25 @@ def fixtures():
     child2.save()
 
     CellTower.drop_collection()
-    ct = CellTower(code='bar', coverage_area=[[[
-                        [-43.36556, -22.99669],
-                        [-43.36539, -23.01928],
-                        [-43.26583, -23.01802],
-                        [-43.36717, -22.98855],
-                        [-43.36636, -22.99351],
-                        [-43.36556, -22.99669]]]])
+    ct = CellTower(
+        code='bar',
+        base=[[
+            [-43.36556, -22.99669],
+            [-43.36539, -23.01928],
+            [-43.26583, -23.01802],
+            [-43.36717, -22.98855],
+            [-43.36636, -22.99351],
+            [-43.36556, -22.99669]
+        ]],
+        coverage_area=[[[
+            [-43.36556, -22.99669],
+            [-43.36539, -23.01928],
+            [-43.26583, -23.01802],
+            [-43.36717, -22.98855],
+            [-43.36636, -22.99351],
+            [-43.36556, -22.99669]
+        ]]]
+    )
     ct.save()
     ProfessorVector.drop_collection()
     professor_metadata = ProfessorMetadata(
@@ -148,4 +160,4 @@ def fixtures():
     child3.parent = child4.parent = parent
     child3.save()
     child4.save()
-    return True
+    return True

graphene_mongo/tests/test_converter.py

@@ -90,6 +90,13 @@ def test_should_point_convert_field():
     assert isinstance(graphene_type.type.coordinates, graphene.List)
 
 
+def test_should_polygon_covert_field():
+    graphene_type = convert_mongoengine_field(mongoengine.PolygonField())
+    assert isinstance(graphene_type, graphene.Field)
+    assert isinstance(graphene_type.type.type, graphene.String)
+    assert isinstance(graphene_type.type.coordinates, graphene.List)
+
+
 def test_should_multipolygon_convert_field():
     graphene_type = convert_mongoengine_field(mongoengine.MultiPolygonField())
     assert isinstance(graphene_type, graphene.Field)

graphene_mongo/tests/test_query.py

@@ -328,6 +328,10 @@ def resolve_cell_towers(self, *args, **kwargs):
         query Query {
             cellTowers {
                 code,
+                base {
+                    type,
+                    coordinates
+                },
                 coverageArea {
                      type,
                      coordinates
@@ -339,6 +343,17 @@ def resolve_cell_towers(self, *args, **kwargs):
         'cellTowers': [
             {
                 'code': 'bar',
+                'base': {
+                    'type': 'Polygon',
+                    'coordinates': [[
+                        [-43.36556, -22.99669],
+                        [-43.36539, -23.01928],
+                        [-43.26583, -23.01802],
+                        [-43.36717, -22.98855],
+                        [-43.36636, -22.99351],
+                        [-43.36556, -22.99669]
+                    ]]
+                },
                 'coverageArea': {
                     'type': 'MultiPolygon',
                     'coordinates': [[[
@@ -347,7 +362,8 @@ def resolve_cell_towers(self, *args, **kwargs):
                         [-43.26583, -23.01802],
                         [-43.36717, -22.98855],
                         [-43.36636, -22.99351],
-                        [-43.36556, -22.99669]]]]
+                        [-43.36556, -22.99669]
+                    ]]]
                 }
             }
         ]

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='graphene-mongo',
-    version='0.2.0',
+    version='0.2.1',
 
     description='Graphene Mongoengine integration',
     long_description=open('README.rst').read(),