Merge pull request #167 from arunsureshkumar/support-monogengine-field-enum

Support monogengine field enum

Author: abawchen

graphene_mongo/converter.py

@@ -1,3 +1,5 @@
+import sys
+
 import graphene
 import mongoengine
 import uuid
@@ -82,22 +84,26 @@ def convert_field_to_jsonstring(field, registry=None):
 
 @convert_mongoengine_field.register(mongoengine.PointField)
 def convert_point_to_field(field, registry=None):
-    return graphene.Field(advanced_types.PointFieldType, required=field.required)
+    return graphene.Field(advanced_types.PointFieldType, description=get_field_description(field, registry),
+                          required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.PolygonField)
 def convert_polygon_to_field(field, registry=None):
-    return graphene.Field(advanced_types.PolygonFieldType, required=field.required)
+    return graphene.Field(advanced_types.PolygonFieldType, description=get_field_description(field, registry),
+                          required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.MultiPolygonField)
-def convert_multipolygon_to_field(field, register=None):
-    return graphene.Field(advanced_types.MultiPolygonFieldType, required=field.required)
+def convert_multipolygon_to_field(field, registry=None):
+    return graphene.Field(advanced_types.MultiPolygonFieldType, description=get_field_description(field, registry),
+                          required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.FileField)
 def convert_file_to_field(field, registry=None):
-    return graphene.Field(advanced_types.FileFieldType, required=field.required)
+    return graphene.Field(advanced_types.FileFieldType, description=get_field_description(field, registry),
+                          required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.ListField)
@@ -421,3 +427,11 @@ def dynamic_type():
         )
 
     return graphene.Dynamic(dynamic_type)
+
+
+if sys.version_info[0] > 3.5:
+    @convert_mongoengine_field.register(mongoengine.EnumField)
+    def convert_field_to_enum(field, registry=None):
+        return graphene.Field(graphene.Enum.from_enum(field._enum_cls),
+                              description=get_field_description(field, registry), required=field.required
+                              )

graphene_mongo/fields.py

@@ -394,6 +394,9 @@ def chained_resolver(self, resolver, is_partial, root, info, **args):
                                 self.filter_args.keys()):
                             args_copy.pop(arg_name)
                             if arg_name == '_id' and isinstance(arg, dict):
+                                args_copy['pk__in'] = arg['$in']
+                            elif "$ne" in arg:
+                                args_copy['pk__ne'] = arg['$ne']
                                 operation = list(arg.keys())[0]
                                 args_copy['pk' + operation.replace('$', '__')] = arg[operation]
                             if '.' in arg_name:

requirements.txt

@@ -1,18 +1,18 @@
-coveralls==1.11.1; python_version <= '3.4'
-coveralls==2.1.2; python_version > '3.4'
+coveralls==1.11.1; python_version <= '3.5'
+coveralls==2.1.2; python_version > '3.5'
 flake8==3.7.9
 flake8-per-file-ignores==0.6
 future==0.18.2
 graphene>=2.1.8,<3
 iso8601==0.1.13
-mongoengine==0.19.1; python_version <= '3.4'
-mongoengine==0.20.0; python_version > '3.4'
-mongomock==3.21.0
-pymongo==3.11.0
-pytest==4.6.11; python_version <= '3.4'
-pytest==6.1.2; python_version > '3.4'
-pytest-cov==2.8.1; python_version == '3.4'
-pytest-cov==2.10.1; python_version < '3.4' or python_version > '3.4'
+mongoengine==0.19.1; python_version <= '3.5'
+mongoengine==0.22.1; python_version > '3.5'
+mongomock==3.22.0
+pymongo==3.11.2
+pytest==4.6.11; python_version <= '3.5'
+pytest==6.2.1; python_version > '3.5'
+pytest-cov==2.8.1; python_version == '3.5' or python_version == '3.4'
+pytest-cov==2.10.1; python_version < '3.4' or python_version > '3.5'
 singledispatch==3.4.0.3
 # https://stackoverflow.com/a/58189684/9041712
 attrs==20.2.0