Clean up module query

client/src/graphql/gql/moduleDetailsQuery.gql

@@ -1,41 +1,37 @@
 #import "./fragments/contentBlockParts.gql"
 query ModulesQuery($slug: String!) {
-  modules(slug: $slug) {
+  module(slug: $slug) {
-    edges {
+    id
-      node {
+    slug
-        id
+    title
-        slug
+    metaTitle
-        title
+    teaser
-        metaTitle
+    intro
-        teaser
+    objectiveGroups {
-        intro
+      edges {
-        objectiveGroups {
+        node {
-          edges {
+          id
-            node {
+          title
-              id
+          objectiveSet {
-              title
+            edges {
-              objectiveSet {
+              node {
-                edges {
+                id
-                  node {
+                text
-                    id
-                    text
-                  }
-                }
               }
             }
           }
         }
-        chapters {
+      }
-          edges {
+    }
-            node {
+    chapters {
-              id
+      edges {
-              title
+        node {
-              contentBlocks {
+          id
-                edges {
+          title
-                  node {
+          contentBlocks {
-                    ...ContentBlockParts
+            edges {
-                  }
+              node {
-                }
+                ...ContentBlockParts
               }
             }
           }

client/src/pages/module.vue

@@ -20,18 +20,15 @@
     },
 
     apollo: {
-      moduleQuery() {
+      module() {
         return {
           query: MODULE_DETAILS_QUERY,
           variables: {
             slug: store.state.moduleSlug
           },
-          manual: true,
+          update(data) {
-          result({data, loading, networkStatus}) {
+            const cleanedData = this.$getRidOfEdges(data);
-            if (!loading) {
+            return cleanedData.module || {};
-              const cleanedData = this.$getRidOfEdges(data);
-              this.module = cleanedData.modules[0] || {};
-            }
           }
         }
       }

server/filteredbook/schema.py

@@ -6,6 +6,7 @@ from graphene import relay
 from graphene_django import DjangoObjectType
 from graphene_django.filter import DjangoFilterConnectionField
 
+from api.utils import get_object
 from book.models import Book, Topic, Module, Chapter, ContentBlock
 from book.schema.queries import BookNode, TopicNode, ModuleNode, ContentBlockNode
 
@@ -49,7 +50,7 @@ class VisibilityNode(DjangoObjectType):
 class BookQuery(object):
     book = relay.Node.Field(BookNode)
     topic = relay.Node.Field(TopicNode)
-    module = relay.Node.Field(ModuleNode)
+    module = graphene.Field(ModuleNode, slug=graphene.String())
     chapter = relay.Node.Field(FilteredChapterNode)
     content_block = relay.Node.Field(ContentBlockNode)
 
@@ -69,3 +70,13 @@ class BookQuery(object):
 
     def resolve_chapters(self, *args, **kwargs):
         return Chapter.objects.filter(**kwargs).live()
+
+    def resolve_module(self, info, **kwargs):
+        slug = kwargs.get('slug')
+        id = kwargs.get('id')
+
+        if id is not None:
+            return get_object(Module, id)
+        if slug is not None:
+            return Module.objects.get(slug=slug)
+        return None