feat: Add advanced_type for PointType and fix test_converter

Author: abawchen

graphene_mongo/converter.py

@@ -12,11 +12,11 @@
     String,
     is_node
 )
-from graphene.types.resolver import dict_resolver
 from graphene.types.json import JSONString
 
 import mongoengine
 
+from .advanced_types import PointType
 from .fields import MongoengineConnectionField
 from .utils import import_single_dispatch
 
@@ -66,25 +66,9 @@ def convert_dict_to_jsonstring(field, registry=None):
     return JSONString(description=field.db_field, required=field.required)
 
 
-def resolve_type(self, info):
-    return self['type']
-
-def resolve_cooridinates(self, info):
-    return self['coordinates']
-
-
 @convert_mongoengine_field.register(mongoengine.PointField)
 def convert_point_to_field(field, register=None):
-    class Point(ObjectType):
-        type = String(resolver=resolve_type)
-        coordinates = List(Float,resolver=resolve_cooridinates)
-        def resolve_type(self, info):
-            return self['type']
-
-        def resolve_cooridinates(self, info):
-            return self['coordinates']
-
-    return Field(Point)
+    return Field(PointType)
 
 
 @convert_mongoengine_field.register(mongoengine.DateTimeField)

graphene_mongo/tests/test_converter.py

@@ -1,8 +1,9 @@
 import graphene
 import mongoengine
 
-from graphene import Dynamic
-from graphene import Node
+from graphene import (
+    Dynamic, Node
+)
 
 from py.test import raises
 
@@ -82,23 +83,11 @@ def test_should_map_convert_json():
     assert_conversion(mongoengine.MapField, graphene.JSONString, field=mongoengine.StringField())
 
 
-# def test_should_point_convert_json():
-#     assert_conversion(mongoengine.PointField, graphene.JSONString)
-
 def test_should_point_convert_field():
-    # def assert_conversion(mongoengine_field, graphene_field, *args, **kwargs):
-    # field = mongoengine_field(*args, **kwargs)
-    # graphene_type = convert_mongoengine_field(field)
-    # assert isinstance(graphene_type, graphene_field)
-    # field = graphene_type.Field()
-    # return field
-    # assert_conversion(mongoengine.PointField, graphene.ObjectType)
-
     graphene_type = convert_mongoengine_field(mongoengine.PointField())
-    assert isinstance(graphene_type, graphene.ObjectType)
-    # print(graphene_type)
-    # assert isinstance(graphene_type, graphene_field)
-    # field = graphene_type.Field()
+    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():

graphene_mongo/tests/test_query.py

@@ -289,19 +289,24 @@ def resolve_children(self, *args, **kwargs):
         }
     '''
     expected = {
-        'editors': [{
-        }]
+        'children': [
+            {
+                'bar': 'BAR',
+                'baz': 'BAZ',
+                'loc': None
+            }, {
+                'bar': 'bar',
+                'baz': 'baz',
+                'loc': {
+                    'type': 'Point',
+                    'coordinates': [10.0, 20.0]
+                }
+            }
+        ]
     }
 
     schema = graphene.Schema(query=Query)
     result = schema.execute(query)
-    # assert not result.errors
-    print('result.data', result.data)
-    # print('abaw')
-    print(ChildType._meta.fields)
-    # metadata = result.data['editor'].pop('metadata')
-    # expected_metadata = expected['editor'].pop('metadata')
-    # assert(json.loads(metadata)) == dict(json.loads(expected_metadata))
-    # assert dict(result.data['editor']) == expected['editor']
-    # assert all(item in result.data['editors'] for item in expected['editors'])
-
+    assert not result.errors
+    assert json.dumps(result.data, sort_keys=True) == \
+        json.dumps(expected, sort_keys=True)