load topic parents

resolvers/__init__.py

@@ -4,7 +4,7 @@ from resolvers.zine import create_shout, get_shout_by_slug, top_month, top_overa
     recent_shouts, top_authors, top_viewed
 from resolvers.profile import get_users_by_slugs, get_current_user
 from resolvers.topics import topic_subscribe, topic_unsubscribe, topics_by_author, \
-    topics_by_community, topics_by_slugs, topics_all
+    topics_by_community, topics_by_slugs
 from resolvers.comments import create_comment
 from resolvers.community import create_community, delete_community, get_community, get_communities
 
@@ -27,7 +27,6 @@ __all__ = [
     "top_month",
     "top_overall",
     "top_viewed",
-    "topics_all",
     "topics_by_slugs",
     "topics_by_community",
     "topics_by_author",

resolvers/topics.py

@@ -1,41 +1,29 @@
-from orm import Topic, TopicSubscription, Shout, User
+from orm import Topic, TopicSubscription, TopicStorage, Shout, User
 from orm.base import local_session
 from resolvers.base import mutation, query, subscription
 from resolvers.zine import ShoutSubscriptions
 from auth.authenticate import login_required
 import asyncio
 
-
-@query.field("topicsAll")
-async def topics_all(_, info):
-	topics = []
-	with local_session() as session:
-		topics = session.query(Topic)
-	return topics
-
 @query.field("topicsBySlugs")
-async def topics_by_slugs(_, info, slugs):
-	topics = []
+async def topics_by_slugs(_, info, slugs = None):
 	with local_session() as session:
-		topics = session.query(Topic).filter(Topic.slug.in_(slugs))
-	return topics
+		return await TopicStorage.get_topics(slugs)
 
 @query.field("topicsByCommunity")
 async def topics_by_community(_, info, community):
-	topics = []
 	with local_session() as session:
-		topics = session.query(Topic).filter(Topic.community == community)
-	return topics
+		return await TopicStorage.get_topics_by_community(community)
 
 @query.field("topicsByAuthor")
 async def topics_by_author(_, info, author):
-	topics = {}
+	slugs = set()
 	with local_session() as session:
 		shouts = session.query(Shout).\
 			filter(Shout.authors.any(User.slug == author))
 		for shout in shouts:
-			topics.update(dict([(topic.slug, topic) for topic in shout.topics]))
-	return topics.values()
+			slugs.update([topic.slug for topic in shout.topics])
+	return await TopicStorage.get_topics(slugs)
 
 @mutation.field("topicSubscribe")
 @login_required