From ab16e5bfe7a396377e4784873549384f9bffe125 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 27 Feb 2017 14:26:20 -0500
Subject: [PATCH] Retrieving comment y id from backend

---
 graph/loaders/comments.js     | 17 +++++++++++++++++
 graph/resolvers/comment.js    |  7 +++++++
 graph/resolvers/root_query.js |  4 +++-
 graph/typeDefs.graphql        |  6 ++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index ad78a1e92..b5f493831 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -270,6 +270,22 @@ const genRecentComments = (_, ids) => {
   .then(util.arrayJoinBy(ids, 'asset_id'));
 };
 
+/**
+ * genComments returns the comments by the id's specified that are considered
+ * public comments (i.e., accepted or not rejected).
+ */
+const genComments = (context, ids) => {
+  return CommentModel.find({
+    id: {
+      $in: ids
+    },
+    status: {
+      $in: ['NONE', 'ACCEPTED']
+    }
+  })
+  .then(util.singleJoinBy(ids, 'id'));
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
@@ -277,6 +293,7 @@ const genRecentComments = (_, ids) => {
  */
 module.exports = (context) => ({
   Comments: {
+    get: new DataLoader((ids) => genComments(context, ids)),
     getByQuery: (query) => getCommentsByQuery(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new util.SharedCacheDataLoader('Comments.countByAssetID', 3600, (ids) => getCountsByAssetID(context, ids)),
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index ef77ff6b5..43577dca0 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,4 +1,11 @@
 const Comment = {
+  parent({parent_id}, _, {loaders: {Comments}}) {
+    if (parent_id == null) {
+      return null;
+    }
+
+    return Comments.get.load(parent_id);
+  },
   user({author_id}, _, {loaders: {Users}}) {
     return Users.getByID.load(author_id);
   },
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index ced4e65cf..6622fd17f 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -38,7 +38,9 @@ const RootQuery = {
 
     return Comments.getByQuery(query);
   },
-
+  comment(_, {id}, {loaders: {Comments}}) {
+    return Comments.get.load(id);
+  },
   commentCount(_, {query: {action_type, statuses, asset_id, parent_id}}, {user, loaders: {Actions, Comments}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index fbdeb4279..b9ab770ac 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -149,6 +149,9 @@ input CommentCountQuery {
 # Comment is the base representation of user interaction in Talk.
 type Comment {
 
+  # The parent of the comment (if there is one).
+  parent: Comment
+
   # The ID of the comment.
   id: ID!
 
@@ -477,6 +480,9 @@ type RootQuery {
   # Site wide settings and defaults.
   settings: Settings
 
+  # Finds a specific comment based on it's id.
+  comment(id: ID!): Comment
+
   # All assets. Requires the `ADMIN` role.
   assets: [Asset]