Merge pull request #205 from strollby/master

Fix UnionType To Support Graphene Federation

Author: arunsureshkumar

graphene_mongo/converter.py

@@ -5,7 +5,7 @@
 import uuid
 
 from graphene.types.json import JSONString
-from graphene.utils.str_converters import to_snake_case
+from graphene.utils.str_converters import to_snake_case, to_camel_case
 from mongoengine.base import get_document, LazyReference
 from . import advanced_types
 from .utils import import_single_dispatch, get_field_description, get_query_fields
@@ -67,6 +67,13 @@ def convert_field_to_float(field, registry=None):
     )
 
 
+@convert_mongoengine_field.register(mongoengine.Decimal128Field)
+def convert_field_to_decimal(field, registry=None):
+    return graphene.Decimal(
+        description=get_field_description(field, registry), required=field.required
+    )
+
+
 @convert_mongoengine_field.register(mongoengine.DateTimeField)
 def convert_field_to_datetime(field, registry=None):
     return graphene.DateTime(
@@ -233,12 +240,10 @@ def convert_field_to_union(field, registry=None):
     if len(_types) == 0:
         return None
 
-    # XXX: Use uuid to avoid duplicate name
-    name = "{}_{}_union_{}".format(
+    name = to_camel_case("{}_{}".format(
         field._owner_document.__name__,
-        field.db_field,
-        str(uuid.uuid1()).replace("-", ""),
-    )
+        field.db_field
+    )) + "UnionType"
     Meta = type("Meta", (object,), {"types": tuple(_types)})
     _union = type(name, (graphene.Union,), {"Meta": Meta})
 

graphene_mongo/tests/models.py

@@ -1,10 +1,11 @@
 import mongoengine
 from datetime import datetime
+import mongomock
 from mongomock import gridfs
 
 gridfs.enable_gridfs_integration()
 mongoengine.connect(
-    "graphene-mongo-test", host="mongomock://localhost", alias="default"
+    "graphene-mongo-test", mongo_client_class=mongomock.MongoClient, alias="default"
 )
 
 

graphene_mongo/tests/test_converter.py

@@ -78,6 +78,10 @@ def test_should_float_convert_float():
     assert_conversion(mongoengine.FloatField, graphene.Float)
 
 
+def test_should_decimal128_convert_decimal():
+    assert_conversion(mongoengine.Decimal128Field, graphene.Decimal)
+
+
 def test_should_datetime_convert_datetime():
     assert_conversion(mongoengine.DateTimeField, graphene.DateTime)
 

graphene_mongo/tests/test_query.py

@@ -31,7 +31,6 @@ def resolve_editors(self, *args, **kwargs):
                     contentType,
                     chunkSize,
                     length,
-                    md5,
                     data
                 }
             }
@@ -54,7 +53,6 @@ def resolve_editors(self, *args, **kwargs):
                 "contentType": "image/jpeg",
                 "chunkSize": 261120,
                 "length": 46928,
-                "md5": "f3c657fd472fdc4bc2ca9056a1ae6106",
                 "data": data.decode("utf-8"),
             },
         },

graphene_mongo/types.py

@@ -232,7 +232,10 @@ def get_node(cls, info, id):
             for field in cls._meta.required_fields:
                 if field in cls._meta.model._fields_ordered:
                     required_fields.append(field)
-            for field in get_query_fields(info):
+            queried_fields = get_query_fields(info)
+            if cls._meta.name in queried_fields:
+                queried_fields = queried_fields[cls._meta.name]
+            for field in queried_fields:
                 if to_snake_case(field) in cls._meta.model._fields_ordered:
                     required_fields.append(to_snake_case(field))
             required_fields = list(set(required_fields))

requirements.txt

@@ -6,7 +6,7 @@ future==0.18.2
 graphene==3.1.1
 promise==2.3
 mongoengine==0.19.1; python_version <= '3.5'
-mongoengine==0.24.2; python_version > '3.5'
+mongoengine==0.27; python_version > '3.5'
 mongomock==4.1.2
 pytest==4.6.11; python_version <= '3.5'
 pytest==7.1.3; python_version > '3.5'