Skip to content

Commit 4d25a72

Browse files
abawchenabawchen
committed
minor: Use mongoengine instead of fields
1 parent f0d9bc7 commit 4d25a72

File tree

3 files changed

+61
-64
lines changed

3 files changed

+61
-64
lines changed

‎graphene_mongo/tests/models.py‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import mongoengine
22
from datetime import datetime
3-
from mongoengine import fields
43

54
mongoengine.connect('graphene-mongo-test', host='mongomock://localhost', alias='default')
65

76

87
class Publisher(mongoengine.Document):
98

109
meta = {'collection': 'test_publisher'}
11-
name = fields.StringField()
10+
name = mongoengine.StringField()
1211

1312
@property
1413
def legal_name(self):
@@ -24,68 +23,68 @@ class Editor(mongoengine.Document):
2423
"""
2524

2625
meta = {'collection': 'test_editor'}
27-
id = fields.StringField(primary_key=True)
28-
first_name = fields.StringField(required=True, help_text="Editor's first name.", db_field='fname')
29-
last_name = fields.StringField(required=True, help_text="Editor's last name.")
30-
metadata = fields.MapField(field=fields.StringField(), help_text="Arbitrary metadata.")
31-
company = fields.LazyReferenceField(Publisher)
26+
id = mongoengine.StringField(primary_key=True)
27+
first_name = mongoengine.StringField(required=True, help_text="Editor's first name.", db_field='fname')
28+
last_name = mongoengine.StringField(required=True, help_text="Editor's last name.")
29+
metadata = mongoengine.MapField(field=mongoengine.StringField(), help_text="Arbitrary metadata.")
30+
company = mongoengine.LazyReferenceField(Publisher)
3231

3332

3433
class Article(mongoengine.Document):
3534

3635
meta = {'collection': 'test_article'}
37-
headline = fields.StringField(required=True, help_text="The article headline.")
38-
pub_date = fields.DateTimeField(
36+
headline = mongoengine.StringField(required=True, help_text="The article headline.")
37+
pub_date = mongoengine.DateTimeField(
3938
default=datetime.now,
4039
verbose_name="publication date",
4140
help_text="The date of first press.")
42-
editor = fields.ReferenceField(Editor)
43-
reporter = fields.ReferenceField('Reporter')
44-
# generic_reference = fields.GenericReferenceField(choices=[Editor])
41+
editor = mongoengine.ReferenceField(Editor)
42+
reporter = mongoengine.ReferenceField('Reporter')
43+
# generic_reference = mongoengine.GenericReferenceField(choices=[Editor])
4544

4645

4746
class EmbeddedArticle(mongoengine.EmbeddedDocument):
4847

4948
meta = {'collection': 'test_embedded_article'}
50-
headline = fields.StringField(required=True)
51-
pub_date = fields.DateTimeField(default=datetime.now)
52-
editor = fields.ReferenceField(Editor)
53-
reporter = fields.ReferenceField('Reporter')
49+
headline = mongoengine.StringField(required=True)
50+
pub_date = mongoengine.DateTimeField(default=datetime.now)
51+
editor = mongoengine.ReferenceField(Editor)
52+
reporter = mongoengine.ReferenceField('Reporter')
5453

5554

5655
class Reporter(mongoengine.Document):
5756

5857
meta = {'collection': 'test_reporter'}
59-
id = fields.StringField(primary_key=True)
60-
first_name = fields.StringField(required=True)
61-
last_name = fields.StringField(required=True)
62-
email = fields.EmailField()
63-
awards = fields.ListField(fields.StringField())
64-
articles = fields.ListField(fields.ReferenceField(Article))
65-
embedded_articles = fields.ListField(fields.EmbeddedDocumentField(EmbeddedArticle))
66-
embedded_list_articles = fields.EmbeddedDocumentListField(EmbeddedArticle)
67-
id = fields.StringField(primary_key=True)
68-
first_name = fields.StringField(required=True)
69-
last_name = fields.StringField(required=True)
70-
email = fields.EmailField()
71-
awards = fields.ListField(fields.StringField())
72-
articles = fields.ListField(fields.ReferenceField(Article))
73-
embedded_articles = fields.ListField(fields.EmbeddedDocumentField(EmbeddedArticle))
74-
embedded_list_articles = fields.EmbeddedDocumentListField(EmbeddedArticle)
75-
generic_reference = fields.GenericReferenceField(
58+
id = mongoengine.StringField(primary_key=True)
59+
first_name = mongoengine.StringField(required=True)
60+
last_name = mongoengine.StringField(required=True)
61+
email = mongoengine.EmailField()
62+
awards = mongoengine.ListField(mongoengine.StringField())
63+
articles = mongoengine.ListField(mongoengine.ReferenceField(Article))
64+
embedded_articles = mongoengine.ListField(mongoengine.EmbeddedDocumentField(EmbeddedArticle))
65+
embedded_list_articles = mongoengine.EmbeddedDocumentListField(EmbeddedArticle)
66+
id = mongoengine.StringField(primary_key=True)
67+
first_name = mongoengine.StringField(required=True)
68+
last_name = mongoengine.StringField(required=True)
69+
email = mongoengine.EmailField()
70+
awards = mongoengine.ListField(mongoengine.StringField())
71+
articles = mongoengine.ListField(mongoengine.ReferenceField(Article))
72+
embedded_articles = mongoengine.ListField(mongoengine.EmbeddedDocumentField(EmbeddedArticle))
73+
embedded_list_articles = mongoengine.EmbeddedDocumentListField(EmbeddedArticle)
74+
generic_reference = mongoengine.GenericReferenceField(
7675
choices=[Article, Editor, ]
7776
)
7877

7978

8079
class Player(mongoengine.Document):
8180

8281
meta = {'collection': 'test_player'}
83-
first_name = fields.StringField(required=True)
84-
last_name = fields.StringField(required=True)
85-
opponent = fields.ReferenceField('Player')
86-
players = fields.ListField(fields.ReferenceField('Player'))
87-
articles = fields.ListField(fields.ReferenceField('Article'))
88-
embedded_list_articles = fields.EmbeddedDocumentListField(EmbeddedArticle)
82+
first_name = mongoengine.StringField(required=True)
83+
last_name = mongoengine.StringField(required=True)
84+
opponent = mongoengine.ReferenceField('Player')
85+
players = mongoengine.ListField(mongoengine.ReferenceField('Player'))
86+
articles = mongoengine.ListField(mongoengine.ReferenceField('Article'))
87+
embedded_list_articles = mongoengine.EmbeddedDocumentListField(EmbeddedArticle)
8988

9089

9190
class Parent(mongoengine.Document):
@@ -94,18 +93,18 @@ class Parent(mongoengine.Document):
9493
'collection': 'test_parent',
9594
'allow_inheritance': True
9695
}
97-
bar = fields.StringField()
98-
loc = fields.MultiPolygonField()
96+
bar = mongoengine.StringField()
97+
loc = mongoengine.MultiPolygonField()
9998

10099

101100
class CellTower(mongoengine.Document):
102101

103102
meta = {
104103
'collection': 'test_cell_tower',
105104
}
106-
code = fields.StringField()
107-
base = fields.PolygonField()
108-
coverage_area = fields.MultiPolygonField()
105+
code = mongoengine.StringField()
106+
base = mongoengine.PolygonField()
107+
coverage_area = mongoengine.MultiPolygonField()
109108

110109

111110
class Child(Parent):

‎graphene_mongo/tests/test_converter.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import graphene
2-
from mongoengine import fields
2+
import mongoengine
33
from py.test import raises
44

55
from .models import (
@@ -26,80 +26,80 @@ def test_should_unknown_mongoengine_field_raise_exception():
2626

2727

2828
def test_should_email_convert_string():
29-
assert_conversion(fields.EmailField, graphene.String)
29+
assert_conversion(mongoengine.EmailField, graphene.String)
3030

3131

3232
def test_should_string_convert_string():
33-
assert_conversion(fields.StringField, graphene.String)
33+
assert_conversion(mongoengine.StringField, graphene.String)
3434

3535

3636
def test_should_url_convert_string():
37-
assert_conversion(fields.URLField, graphene.String)
37+
assert_conversion(mongoengine.URLField, graphene.String)
3838

3939

4040
def test_should_uuid_convert_id():
41-
assert_conversion(fields.UUIDField, graphene.ID)
41+
assert_conversion(mongoengine.UUIDField, graphene.ID)
4242

4343

4444
def test_sould_int_convert_int():
45-
assert_conversion(fields.IntField, graphene.Int)
45+
assert_conversion(mongoengine.IntField, graphene.Int)
4646

4747

4848
def test_sould_long_convert_int():
49-
assert_conversion(fields.LongField, graphene.Int)
49+
assert_conversion(mongoengine.LongField, graphene.Int)
5050

5151

5252
def test_should_object_id_convert_id():
53-
assert_conversion(fields.ObjectIdField, graphene.ID)
53+
assert_conversion(mongoengine.ObjectIdField, graphene.ID)
5454

5555

5656
def test_should_boolean_convert_boolean():
57-
assert_conversion(fields.BooleanField, graphene.Boolean)
57+
assert_conversion(mongoengine.BooleanField, graphene.Boolean)
5858

5959

6060
def test_should_decimal_convert_float():
61-
assert_conversion(fields.DecimalField, graphene.Float)
61+
assert_conversion(mongoengine.DecimalField, graphene.Float)
6262

6363

6464
def test_should_float_convert_float():
65-
assert_conversion(fields.FloatField, graphene.Float)
65+
assert_conversion(mongoengine.FloatField, graphene.Float)
6666

6767

6868
def test_should_datetime_convert_datetime():
69-
assert_conversion(fields.DateTimeField, graphene.DateTime)
69+
assert_conversion(mongoengine.DateTimeField, graphene.DateTime)
7070

7171

7272
def test_should_dict_convert_json():
73-
assert_conversion(fields.DictField, graphene.JSONString)
73+
assert_conversion(mongoengine.DictField, graphene.JSONString)
7474

7575

7676
def test_should_map_convert_json():
77-
assert_conversion(fields.MapField, graphene.JSONString, field=fields.StringField())
77+
assert_conversion(mongoengine.MapField, graphene.JSONString, field=mongoengine.StringField())
7878

7979

8080
def test_should_point_convert_field():
81-
graphene_type = convert_mongoengine_field(fields.PointField())
81+
graphene_type = convert_mongoengine_field(mongoengine.PointField())
8282
assert isinstance(graphene_type, graphene.Field)
8383
assert isinstance(graphene_type.type.type, graphene.String)
8484
assert isinstance(graphene_type.type.coordinates, graphene.List)
8585

8686

8787
def test_should_polygon_covert_field():
88-
graphene_type = convert_mongoengine_field(fields.PolygonField())
88+
graphene_type = convert_mongoengine_field(mongoengine.PolygonField())
8989
assert isinstance(graphene_type, graphene.Field)
9090
assert isinstance(graphene_type.type.type, graphene.String)
9191
assert isinstance(graphene_type.type.coordinates, graphene.List)
9292

9393

9494
def test_should_multipolygon_convert_field():
95-
graphene_type = convert_mongoengine_field(fields.MultiPolygonField())
95+
graphene_type = convert_mongoengine_field(mongoengine.MultiPolygonField())
9696
assert isinstance(graphene_type, graphene.Field)
9797
assert isinstance(graphene_type.type.type, graphene.String)
9898
assert isinstance(graphene_type.type.coordinates, graphene.List)
9999

100100

101101
def test_should_field_convert_list():
102-
assert_conversion(fields.ListField, graphene.List, field=fields.StringField())
102+
assert_conversion(mongoengine.ListField, graphene.List, field=mongoengine.StringField())
103103

104104

105105
def test_should_reference_convert_dynamic():

‎graphene_mongo/tests/test_query.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,10 @@ def resolve_reporter(self, *args, **kwargs):
122122
}
123123
}
124124

125-
"""
126125
schema = graphene.Schema(query=Query)
127126
result = schema.execute(query)
128127
assert not result.errors
129128
assert dict(result.data['reporter']) == expected['reporter']
130-
"""
131129

132130
def test_should_custom_kwargs(fixtures):
133131

0 commit comments

Comments
 (0)