ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Rename all *Node => *Type except for ContentBlock because the name clashes

This commit is contained in:
Pawel Kowalski 2018-08-23 17:50:45 +02:00
parent 69af860187
commit edb43ce2a3
4 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/book/schema.py
View File

@ -6,7 +6,7 @@ from graphene_django.filter import DjangoFilterConnectionField
from .models import Book, Topic, Module, Chapter, ContentBlock from .models import Book, Topic, Module, Chapter, ContentBlock
class ContentBlockNode(DjangoObjectType): class ContentBlockNodeType(DjangoObjectType):
class Meta: class Meta:
model = ContentBlock model = ContentBlock
only_fields = [ only_fields = [
@ -18,8 +18,8 @@ class ContentBlockNode(DjangoObjectType):
interfaces = (relay.Node,) interfaces = (relay.Node,)
class ChapterNode(DjangoObjectType): class ChapterType(DjangoObjectType):
content_blocks = DjangoFilterConnectionField(ContentBlockNode) content_blocks = DjangoFilterConnectionField(ContentBlockNodeType)
class Meta: class Meta:
model = Chapter model = Chapter
@ -35,9 +35,9 @@ class ChapterNode(DjangoObjectType):
return ContentBlock.get_by_parent(self) return ContentBlock.get_by_parent(self)
class ModuleNode(DjangoObjectType): class ModuleType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
chapters = DjangoFilterConnectionField(ChapterNode) chapters = DjangoFilterConnectionField(ChapterType)
hero_image = graphene.String() hero_image = graphene.String()
class Meta: class Meta:
@ -62,9 +62,9 @@ class ModuleNode(DjangoObjectType):
return Chapter.get_by_parent(self) return Chapter.get_by_parent(self)
class TopicNode(DjangoObjectType): class TopicType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
modules = DjangoFilterConnectionField(ModuleNode) modules = DjangoFilterConnectionField(ModuleType)
class Meta: class Meta:
model = Topic model = Topic
@ -84,9 +84,9 @@ class TopicNode(DjangoObjectType):
return Module.get_by_parent(self) return Module.get_by_parent(self)
class BookNode(DjangoObjectType): class BookType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
topics = DjangoFilterConnectionField(TopicNode) topics = DjangoFilterConnectionField(TopicType)
class Meta: class Meta:
model = Book model = Book
@ -107,11 +107,11 @@ class BookNode(DjangoObjectType):
class BookQuery(object): class BookQuery(object):
module = relay.Node.Field(ModuleNode) module = relay.Node.Field(ModuleType)
books = DjangoFilterConnectionField(BookNode) books = DjangoFilterConnectionField(BookType)
topics = DjangoFilterConnectionField(TopicNode) topics = DjangoFilterConnectionField(TopicType)
modules = DjangoFilterConnectionField(ModuleNode) modules = DjangoFilterConnectionField(ModuleType)
def resolve_books(self, *args, **kwargs): def resolve_books(self, *args, **kwargs):
return Book.objects.filter(**kwargs).live() return Book.objects.filter(**kwargs).live()

8
server/objectives/schema.py
View File

@ -6,7 +6,7 @@ from graphene_django.filter import DjangoFilterConnectionField
from objectives.models import ObjectiveGroup, Objective, ObjectiveProgressStatus from objectives.models import ObjectiveGroup, Objective, ObjectiveProgressStatus
class ObjectiveGroupNode(DjangoObjectType): class ObjectiveGroupType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
class Meta: class Meta:
@ -18,7 +18,7 @@ class ObjectiveGroupNode(DjangoObjectType):
return self.id return self.id
class ObjectiveNode(DjangoObjectType): class ObjectiveType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
class Meta: class Meta:
@ -27,7 +27,7 @@ class ObjectiveNode(DjangoObjectType):
interfaces = (relay.Node,) interfaces = (relay.Node,)
class ObjectiveProgressStatusNode(DjangoObjectType): class ObjectiveProgressStatusType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
class Meta: class Meta:
@ -40,4 +40,4 @@ class ObjectiveProgressStatusNode(DjangoObjectType):
class ObjectivesQuery(object): class ObjectivesQuery(object):
objective_groups = DjangoFilterConnectionField(ObjectiveGroupNode) objective_groups = DjangoFilterConnectionField(ObjectiveGroupType)

10
server/rooms/schema.py
View File

@ -4,12 +4,12 @@ from graphene_django import DjangoObjectType
from graphene_django.filter import DjangoFilterConnectionField from graphene_django.filter import DjangoFilterConnectionField
from rooms.models import Room, RoomEntry from rooms.models import Room, RoomEntry
from user.schema import UserGroupNode, UserNode from user.schema import UserGroupNode, UserType
class RoomEntryNode(DjangoObjectType): class RoomEntryType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
author = UserNode() author = UserType()
class Meta: class Meta:
model = RoomEntry model = RoomEntry
@ -35,10 +35,10 @@ class RoomType(DjangoObjectType):
class RoomsQuery(object): class RoomsQuery(object):
room = graphene.Field(RoomType, slug=graphene.String(), id=graphene.Int(), appearance=graphene.String()) room = graphene.Field(RoomType, slug=graphene.String(), id=graphene.Int(), appearance=graphene.String())
room_entry = relay.Node.Field(RoomEntryNode) room_entry = relay.Node.Field(RoomEntryType)
all_rooms = DjangoFilterConnectionField(RoomType) all_rooms = DjangoFilterConnectionField(RoomType)
all_room_entries = DjangoFilterConnectionField(RoomEntryNode) all_room_entries = DjangoFilterConnectionField(RoomEntryType)
def resolve_room(self, info, **kwargs): def resolve_room(self, info, **kwargs):
slug = kwargs.get('slug') slug = kwargs.get('slug')

7
server/user/schema.py
View File

@ -1,12 +1,11 @@
import graphene import graphene
from graphene import relay from graphene import relay
from graphene_django import DjangoObjectType from graphene_django import DjangoObjectType
from graphene_django.filter import DjangoFilterConnectionField
from user.models import UserGroup, User from user.models import UserGroup, User
class UserNode(DjangoObjectType): class UserType(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
class Meta: class Meta:
@ -20,7 +19,6 @@ class UserNode(DjangoObjectType):
class UserGroupNode(DjangoObjectType): class UserGroupNode(DjangoObjectType):
pk = graphene.Int() pk = graphene.Int()
users = DjangoFilterConnectionField(UserNode)
class Meta: class Meta:
model = UserGroup model = UserGroup
@ -29,6 +27,3 @@ class UserGroupNode(DjangoObjectType):
def resolve_pk(self, *args, **kwargs): def resolve_pk(self, *args, **kwargs):
return self.id return self.id
def resolve_users(self, *args, **kwargs):
return self.users