Merge branch 'master' into dont-agree

graph/loaders/comments.js

@@ -68,6 +68,38 @@ const getCountsByParentID = (context, parent_ids) => {
   .then((results) => results.map((result) => result ? result.count : 0));
 };
 
+/**
+ * Retrieves the count of comments based on the passed in query.
+ * @param  {Object} context   graph context
+ * @param  {Object} query     query to execute against the comments collection
+ *                            to compute the counts
+ * @return {Promise}          resolves to the counts of the comments from the
+ *                            query
+ */
+const getCommentCountByQuery = (context, {ids, statuses, asset_id, parent_id}) => {
+  let query = CommentModel.find();
+
+  if (ids) {
+    query = query.where({id: {$in: ids}});
+  }
+
+  if (statuses) {
+    query = query.where({status: {$in: statuses}});
+  }
+
+  if (asset_id != null) {
+    query = query.where({asset_id});
+  }
+
+  if (parent_id !== undefined) {
+    query = query.where({parent_id});
+  }
+
+  return CommentModel
+    .find(query)
+    .count();
+};
+
 /**
  * Retrieves comments based on the passed in query that is filtered by the
  * current used passed in via the context.
@@ -101,6 +133,7 @@ const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_
     });
   }
 
+  // Only let an admin request any user or the current user request themself.
   if (user && (user.hasRoles('ADMIN') || user.id === author_id) && author_id != null) {
     comments = comments.where({author_id});
   }
@@ -136,7 +169,13 @@ const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_
     .limit(limit);
 };
 
-const genRecentReplies = (_, ids) => {
+/**
+ * Gets the recent replies.
+ * @param  {Object}        context   graph context
+ * @param  {Array<String>} ids       ids of parent ids
+ * @return {Promise}                 resolves to recent replies
+ */
+const genRecentReplies = (context, ids) => {
   return CommentModel.aggregate([
 
     // get all the replies for the comments in question
@@ -180,6 +219,12 @@ const genRecentReplies = (_, ids) => {
   .then(util.arrayJoinBy(ids, 'parent_id'));
 };
 
+/**
+ * Gets the recent comments.
+ * @param  {Object}        context   graph context
+ * @param  {Array<String>} ids       ids of asset ids
+ * @return {Promise}                 resolves to recent comments from assets
+ */
 const genRecentComments = (_, ids) => {
   return CommentModel.aggregate([
 
@@ -233,6 +278,7 @@ const genRecentComments = (_, ids) => {
 module.exports = (context) => ({
   Comments: {
     getByQuery: (query) => getCommentsByQuery(context, query),
+    getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new util.SharedCacheDataLoader('Comments.countByAssetID', 3600, (ids) => getCountsByAssetID(context, ids)),
     countByParentID: new util.SharedCacheDataLoader('Comments.countByParentID', 3600, (ids) => getCountsByParentID(context, ids)),
     genRecentReplies: new DataLoader((ids) => genRecentReplies(context, ids)),

graph/mutators/comment.js

@@ -15,11 +15,18 @@ const Wordlist = require('../../services/wordlist');
  * @return {Promise}              resolves to the created comment
  */
 const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id = null}, status = 'NONE') => {
+
+  let tags = [];
+  if (user.hasRoles('ADMIN') || user.hasRoles('MODERATOR')) {
+    tags = [{name: 'STAFF'}];
+  }
+
   return CommentsService.publicCreate({
     body,
     asset_id,
     parent_id,
     status,
+    tags,
     author_id: user.id
   })
   .then((comment) => {
@@ -36,12 +43,6 @@ const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id =
       }
     }
 
-    if (user.hasRoles('ADMIN')) {
-      return CommentsService
-        .addTag(comment.id, 'STAFF', user.id)
-        .then(() => comment);
-    }
-
     return comment;
   });
 };
@@ -140,12 +141,12 @@ const createPublicComment = (context, commentInput) => {
         // Otherwise just return the new comment.
 
         // TODO: Check why the wordlist is undefined
-        if (wordlist != null) {
+        if (wordlist != null && wordlist.suspect != null) {
 
           // TODO: this is kind of fragile, we should refactor this to resolve
           // all these const's that we're using like 'COMMENTS', 'FLAG' to be
           // defined in a checkable schema.
-          return context.mutators.Action.createAction(null, {
+          return context.mutators.Action.create({
             item_id: comment.id,
             item_type: 'COMMENTS',
             action_type: 'FLAG',

graph/resolvers/root_mutation.js

@@ -1,3 +1,6 @@
+const {Error: {ValidationError}} = require('mongoose');
+const errors = require('../../errors');
+
 /**
  * Wraps up a promise to return an object with the resolution of the promise
  * keyed at `key` or an error caught at `errors`.
@@ -9,9 +12,20 @@ const wrapResponse = (key) => (promise) => {
       res[key] = value;
     }
     return res;
-  }).catch((err) => ({
-    errors: [err]
-  }));
+  }).catch((err) => {
+
+    if (err instanceof errors.APIError) {
+      return {
+        errors: [err]
+      };
+    } else if (err instanceof ValidationError) {
+
+      // TODO: wrap this with one of our internal errors.
+      throw err;
+    }
+
+    throw err;
+  });
 };
 
 const RootMutation = {

graph/resolvers/root_query.js

@@ -39,6 +39,23 @@ const RootQuery = {
     return Comments.getByQuery(query);
   },
 
+  commentCount(_, {query: {action_type, statuses, asset_id, parent_id}}, {user, loaders: {Actions, Comments}}) {
+    if (user == null || !user.hasRoles('ADMIN')) {
+      return null;
+    }
+
+    if (action_type) {
+      return Actions.getByTypes({action_type, item_type: 'COMMENTS'})
+        .then((ids) => {
+
+          // Perform the query using the available resolver.
+          return Comments.getCountByQuery({ids, statuses, asset_id, parent_id});
+        });
+    }
+
+    return Comments.getCountByQuery({statuses, asset_id, parent_id});
+  },
+
   metrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;

graph/typeDefs.graphql

@@ -27,7 +27,7 @@ type User {
   # The ID of the User.
   id: ID!
 
-  # username of a user.
+  # Username of a user.
   username: String!
 
   # Action summaries against the user.
@@ -99,10 +99,40 @@ enum ACTION_TYPE {
 # CommentsQuery allows the ability to query comments by a specific methods.
 input CommentsQuery {
 
-  # current status of a comment.
+  # Current status of a comment. Requires the `ADMIN` role.
   statuses: [COMMENT_STATUS!]
 
-  # asset that a comment is on.
+  # Asset that a comment is on.
+  asset_id: ID
+
+  # The parent of the comment that we want to retrieve.
+  parent_id: ID
+
+  # Comments returned will only be ones which have at least one action of this
+  # type. Requires the `ADMIN` role.
+  action_type: ACTION_TYPE
+
+  # Limit the number of results to be returned.
+  limit: Int = 10
+
+  # Skip results from the last created_at timestamp.
+  cursor: Date
+
+  # Filter by a specific tag name.
+  tag: [String]
+
+  # Sort the results by created_at.
+  sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
+}
+
+# CommentCountQuery allows the ability to query comment counts by specific
+# methods.
+input CommentCountQuery {
+
+  # Current status of a comment. Requires the `ADMIN` role.
+  statuses: [COMMENT_STATUS!]
+
+  # Asset that a comment is on.
   asset_id: ID
 
   # the parent of the comment that we want to retrieve.
@@ -112,17 +142,8 @@ input CommentsQuery {
   # type.
   action_type: ACTION_TYPE
 
-  # limit the number of results to be returned.
-  limit: Int = 10
-
-  # skip results from the last created_at timestamp.
-  cursor: Date
-
-  # filter by a specific tag name.
+  # Filter by a specific tag name.
   tag: [String]
-
-  # sort the results by created_at.
-  sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
 }
 
 # Comment is the base representation of user interaction in Talk.
@@ -149,7 +170,7 @@ type Comment {
   # The count of replies on a comment.
   replyCount: Int
 
-  # Actions completed on the parent.
+  # Actions completed on the parent. Requires the `ADMIN` role.
   actions: [Action]
 
   # Action summaries against a comment.
@@ -388,7 +409,7 @@ type Asset {
   closedAt: Date
 
   # Summary of all Actions against all entities associated with the Asset.
-  # (likes, flags, etc.)
+  # (likes, flags, etc.). Requires the `ADMIN` role.
   action_summaries: [AssetActionSummary]
 
   # The date that the asset was created.
@@ -456,7 +477,7 @@ type RootQuery {
   # Site wide settings and defaults.
   settings: Settings
 
-  # All assets.
+  # All assets. Requires the `ADMIN` role.
   assets: [Asset]
 
   # Find or create an asset by url, or just find with the ID.
@@ -465,7 +486,12 @@ type RootQuery {
   # Comments returned based on a query.
   comments(query: CommentsQuery!): [Comment]
 
-  # The currently logged in user based on the request.
+  # Returne the count of comments satisfied by the query. Note that this edge is
+  # expensive as it is not batched. Requires the `ADMIN` role.
+  commentCount(query: CommentCountQuery!): Int
+
+  # The currently logged in user based on the request. Requires any logged in
+  # role.
   me: User
 
   # Metrics related to user actions are saturated into the assets returned. The
@@ -623,10 +649,10 @@ type RootMutation {
   # Delete an action based on the action id.
   deleteAction(id: ID!): DeleteActionResponse
 
-  # Sets User status
+  # Sets User status. Requires the `ADMIN` role.
   setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse
 
-  # Sets Comment status
+  # Sets Comment status. Requires the `ADMIN` role.
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 }