Merge pull request #66 from heron182/feat/support-multipolygon-field

Add support for MultiPolygonField

Author: abawchen

graphene_mongo/advanced_types.py

@@ -2,19 +2,33 @@
 
 
 __all__ = [
-    'PointFieldType'
+    'PointFieldType',
+    'MultiPolygonFieldType'
 ]
 
 
-def _resolve_point_type_coordinates(self, info):
+def _resolve_type_coordinates(self, info):
     return self['coordinates']
 
 
 class PointFieldType(graphene.ObjectType):
 
     type = graphene.String()
     coordinates = graphene.List(
-        graphene.Float, resolver=_resolve_point_type_coordinates)
+        graphene.Float, resolver=_resolve_type_coordinates)
+
+    def resolve_type(self, info):
+        return self['type']
+
+
+class MultiPolygonFieldType(graphene.ObjectType):
+
+    type = graphene.String()
+    coordinates = graphene.List(
+                    graphene.List(
+                        graphene.List(
+                            graphene.List(graphene.Float))),
+                    resolver=_resolve_type_coordinates)
 
     def resolve_type(self, info):
         return self['type']

graphene_mongo/converter.py

@@ -15,7 +15,7 @@
 
 import mongoengine
 
-from .advanced_types import PointFieldType
+from .advanced_types import PointFieldType, MultiPolygonFieldType
 from .fields import MongoengineConnectionField
 from .utils import import_single_dispatch
 
@@ -70,6 +70,11 @@ def convert_point_to_field(field, register=None):
     return Field(PointFieldType)
 
 
+@convert_mongoengine_field.register(mongoengine.MultiPolygonField)
+def convert_multipolygon_to_field(field, register=None):
+    return Field(MultiPolygonFieldType)
+
+
 @convert_mongoengine_field.register(mongoengine.DateTimeField)
 def convert_field_to_datetime(field, registry=None):
     return DateTime(description=field.db_field, required=field.required)

graphene_mongo/fields.py

@@ -12,7 +12,7 @@
 from graphene.types.dynamic import Dynamic
 from graphene.types.structures import Structure
 
-from .advanced_types import PointFieldType
+from .advanced_types import PointFieldType, MultiPolygonFieldType
 from .utils import get_model_reference_fields
 
 
@@ -60,7 +60,7 @@ def is_filterable(v):
                 return False
             # FIXME: Skip PointTypeField at this moment.
             if not isinstance(v.type, Structure) \
-                    and isinstance(v.type(), PointFieldType):
+                    and isinstance(v.type(), (PointFieldType, MultiPolygonFieldType)):
                 return False
             return True
 

graphene_mongo/tests/models.py

@@ -5,7 +5,8 @@
 from mongoengine.fields import (
     DateTimeField, EmailField, EmbeddedDocumentField,
     FloatField, EmbeddedDocumentListField, ListField,
-    MapField, PointField, ReferenceField, StringField
+    MapField, PointField, ReferenceField, StringField,
+    MultiPolygonField
 )
 
 connect('graphene-mongo-test', host='mongomock://localhost', alias='default')
@@ -69,6 +70,16 @@ class Parent(Document):
         'allow_inheritance': True
     }
     bar = StringField()
+    loc = MultiPolygonField()
+
+
+class CellTower(Document):
+
+    meta = {
+        'collection': 'test_cell_tower',
+    }
+    code = StringField()
+    coverage_area = MultiPolygonField()
 
 
 class Child(Parent):

graphene_mongo/tests/setup.py

@@ -5,7 +5,7 @@
     Article, Editor, EmbeddedArticle, Player,
     Reporter, Child, ProfessorMetadata, ProfessorVector,
     ChildRegisteredBefore, ChildRegisteredAfter,
-    ParentWithRelationship,
+    ParentWithRelationship, CellTower
 )
 
 
@@ -98,6 +98,15 @@ def fixtures():
     child2 = Child(bar='bar', baz='baz', loc=[10, 20])
     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.save()
     ProfessorVector.drop_collection()
     professor_metadata = ProfessorMetadata(
         id='5e06aa20-6805-4eef-a144-5615dedbe32b',

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_multipolygon_convert_field():
+    graphene_type = convert_mongoengine_field(mongoengine.MultiPolygonField())
+    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_field_convert_list():
     assert_conversion(mongoengine.ListField, graphene.List, field=mongoengine.StringField())
 

graphene_mongo/tests/test_query.py

@@ -4,10 +4,10 @@
 
 from .setup import fixtures
 from .models import (
-    Child, Editor, Player, Reporter, ProfessorVector
+    Child, Editor, Player, Reporter, ProfessorVector, Parent, CellTower
 )
 from .types import (
-    ChildType, EditorType, PlayerType, ReporterType, ProfessorVectorType
+    ChildType, EditorType, PlayerType, ReporterType, ProfessorVectorType, ParentType, CellTowerType
 )
 
 
@@ -310,3 +310,48 @@ def resolve_children(self, *args, **kwargs):
     assert not result.errors
     assert json.dumps(result.data, sort_keys=True) == \
         json.dumps(expected, sort_keys=True)
+
+
+def test_should_query_cell_tower(fixtures):
+
+    class Query(graphene.ObjectType):
+
+        cell_towers = graphene.List(CellTowerType)
+
+        def resolve_cell_towers(self, *args, **kwargs):
+            return list(CellTower.objects.all())
+
+    query = '''
+        query Query {
+            cellTowers {
+                code,
+                coverageArea {
+                     type,
+                     coordinates
+                }
+            }
+        }
+    '''
+    expected = {
+        'cellTowers': [
+            {
+                'code': 'bar',
+                'coverageArea': {
+                    'type': 'MultiPolygon',
+                    '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]]]]
+                }
+            }
+        ]
+    }
+
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+    assert json.dumps(result.data, sort_keys=True) == \
+        json.dumps(expected, sort_keys=True)

graphene_mongo/tests/types.py

@@ -5,7 +5,7 @@
     Article, Editor, EmbeddedArticle, Player, Reporter,
     Parent, Child, ProfessorMetadata, ProfessorVector,
     ParentWithRelationship, ChildRegisteredBefore,
-    ChildRegisteredAfter
+    ChildRegisteredAfter, CellTower
 )
 
 
@@ -51,6 +51,12 @@ class Meta:
         model = Child
 
 
+class CellTowerType(MongoengineObjectType):
+
+    class Meta:
+        model = CellTower
+
+
 class ProfessorMetadataType(MongoengineObjectType):
 
     class Meta: