feat: Add FsFileType.data

Author: abawchen

graphene_mongo/advanced_types.py

@@ -11,8 +11,7 @@ def _resolve_type_coordinates(self, info):
 
 def _resolve_data(self, info):
     v = getattr(self.instance, self.key)
-    data = v.read()
-    return base64.b64encode(data)
+    return base64.b64encode(v.read())
 
 
 class FsFile(mongoengine.Document):
@@ -30,7 +29,17 @@ class FsFileType(MongoengineObjectType):
     class Meta:
         model = FsFile
 
-    data = graphene.String(resolver=_resolve_data)
+    # data = graphene.String(
+    #     resolver=lambda self, *args, **kwargs: self.resolve_data())
+
+    data = graphene.String(
+        resolver=_resolve_data)
+
+    def resolve_data(self):
+        v = getattr(self.instance, self.key)
+        data = v.read()
+        print(type(data))
+        return base64.b64encode(data)
 
 
 class _TypeField(graphene.ObjectType):

graphene_mongo/tests/setup.py

@@ -11,6 +11,12 @@
 
 current_dirname = os.path.dirname(os.path.abspath(__file__))
 
+
+@pytest.fixture()
+def fixtures_dirname():
+    return os.path.join(current_dirname, 'fixtures')
+
+
 @pytest.fixture(scope='module')
 def fixtures():
     Publisher.drop_collection()
@@ -31,13 +37,6 @@ def fixtures():
         editor1.avatar.put(f, content_type='image/jpeg')
     editor1.save()
 
-    e = Editor.objects(first_name='Penny').first()
-    avatar = e.avatar.read()
-    print(e.avatar.content_type)
-    print(e.avatar.chunk_size)
-    print(e.avatar.md5)
-    print(type(avatar))
-
     editor2 = Editor(
         id='2',
         first_name='Grant',

graphene_mongo/tests/test_query.py

@@ -1,8 +1,9 @@
+import base64
+import os
 import json
-
 import graphene
 
-from .setup import fixtures
+from .setup import fixtures, fixtures_dirname
 from .models import (
     Child, Editor, Player, Reporter, ProfessorVector, Parent, CellTower
 )
@@ -11,7 +12,7 @@
 )
 
 
-def test_should_query_editor(fixtures):
+def test_should_query_editor(fixtures, fixtures_dirname):
 
     class Query(graphene.ObjectType):
 
@@ -37,7 +38,7 @@ def resolve_editors(self, *args, **kwargs):
                     chunkSize,
                     length,
                     md5,
-                    chunk
+                    data
                 }
             }
             editors {
@@ -46,6 +47,11 @@ def resolve_editors(self, *args, **kwargs):
             }
         }
     '''
+
+    avator_filename = os.path.join(fixtures_dirname, 'image.jpg')
+    with open(avator_filename, 'rb') as f:
+        data = base64.b64encode(f.read())
+
     expected = {
         'editor': {
             'firstName': 'Penny',
@@ -55,7 +61,7 @@ def resolve_editors(self, *args, **kwargs):
                 'chunkSize': 261120,
                 'length': 46928,
                 'md5': 'f3c657fd472fdc4bc2ca9056a1ae6106',
-                'chunk': 'abc'
+                'data': str(data)
             }
         },
         'editors': [{