From eda15538fea12e78670bad25868633e9e325975d Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 20 Apr 2017 10:02:09 -0600
Subject: [PATCH] add kiwi's and wyatt's changes

---
 graph/typeDefs.graphql                        |  6 +--
 .../client/containers/RespectButton.js        | 53 +++++++++++++------
 services/actions.js                           | 10 +++-
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 0a067b49c..eb376b0de 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -31,7 +31,7 @@ type User {
   username: String!
 
   # Action summaries against the user.
-  action_summaries: [ActionSummary]
+  action_summaries: [ActionSummary]!
 
   # Actions completed on the parent.
   actions: [Action]
@@ -197,7 +197,7 @@ type Comment {
   actions: [Action]
 
   # Action summaries against a comment.
-  action_summaries: [ActionSummary]
+  action_summaries: [ActionSummary]!
 
   # The asset that a comment was made on.
   asset: Asset
@@ -440,7 +440,7 @@ type Asset {
 
   # Summary of all Actions against all entities associated with the Asset.
   # (likes, flags, etc.). Requires the `ADMIN` role.
-  action_summaries: [AssetActionSummary]
+  action_summaries: [AssetActionSummary!]
 
   # The date that the asset was created.
   created_at: Date
diff --git a/plugins/coral-plugin-respect/client/containers/RespectButton.js b/plugins/coral-plugin-respect/client/containers/RespectButton.js
index 047f7991f..bcf0e342d 100644
--- a/plugins/coral-plugin-respect/client/containers/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/containers/RespectButton.js
@@ -10,6 +10,8 @@ import RespectButton from '../components/RespectButton';
 // See https://dev-blog.apollodata.com/apollo-clients-new-imperative-store-api-6cb69318a1e3
 // and https://github.com/apollographql/apollo-client/issues/1224
 
+const isRespectAction = (a) => a.__typename === 'RespectActionSummary';
+
 export const RESPECT_QUERY = gql`
   query RespectQuery($commentId: ID!) {
     comment(id: $commentId) {
@@ -52,18 +54,21 @@ const withDeleteAction = graphql(gql`
         },
         updateQueries: {
           RespectQuery: (prev) => {
-            if (get(prev, 'comment.action_summaries.0.current_user.id') !== id) {
+            const action_summaries = prev.comment.action_summaries;
+            const idx = action_summaries.findIndex(isRespectAction);
+            if (idx < 0 || get(action_summaries[idx], 'current_user.id') !== id) {
               return prev;
             }
             const next = {
               ...prev,
               comment: {
                 ...prev.comment,
-                action_summaries: [{
-                  __typename: 'RespectActionSummary',
-                  count: prev.comment.action_summaries[0].count - 1,
-                  current_user: null,
-                }],
+                action_summaries: action_summaries.map(
+                  (a, i) => i !== idx ? a : ({
+                    ...a,
+                    count: a.count - 1,
+                    current_user: null,
+                  })),
               }
             };
             return next;
@@ -102,21 +107,40 @@ const withPostRespect = graphql(gql`
         },
         updateQueries: {
           RespectQuery: (prev, {mutationResult, queryVariables}) => {
-            if (queryVariables.commentId !== respect.item_id ||
-                get(prev, 'comment.action_summaries.0.current_user')) {
+            if (queryVariables.commentId !== respect.item_id) {
               return prev;
             }
+
+            let action_summaries = prev.comment.action_summaries;
+            let idx = action_summaries.findIndex(isRespectAction);
+
+            // Check whether we already respected this comment.
+            if (idx >= 0 && action_summaries[idx].current_user) {
+              return prev;
+            }
+
+            if (idx < 0) {
+
+              // Add initial action when it doesn't exist.
+              action_summaries = action_summaries.concat([{
+                __typename: 'RespectActionSummary',
+                count: 0,
+                current_user: null,
+              }]);
+              idx = action_summaries.length - 1;
+            }
+
             const respectAction = mutationResult.data.createRespect.respect;
-            const count = prev.comment.action_summaries[0] ? prev.comment.action_summaries[0].count : 0;
             const next = {
               ...prev,
               comment: {
                 ...prev.comment,
-                action_summaries: [{
-                  __typename: 'RespectActionSummary',
-                  count: count + 1,
-                  current_user: respectAction,
-                }],
+                action_summaries: action_summaries.map(
+                  (a, i) => i !== idx ? a : ({
+                    ...a,
+                    count: a.count + 1,
+                    current_user: respectAction,
+                  })),
               }
             };
             return next;
@@ -138,4 +162,3 @@ const enhance = compose(
 );
 
 export default enhance(RespectButton);
-
diff --git a/services/actions.js b/services/actions.js
index 0bcb81af0..40bef65bb 100644
--- a/services/actions.js
+++ b/services/actions.js
@@ -48,10 +48,16 @@ module.exports = class ActionsService {
    * Finds actions in an array of ids.
    * @param {String} ids array of user identifiers (uuid)
   */
-  static findByItemIdArray(item_ids) {
-    return ActionModel.find({
+  static async findByItemIdArray(item_ids) {
+    let actions = await ActionModel.find({
       'item_id': {$in: item_ids}
     });
+
+    if (actions === null) {
+      return [];
+    }
+
+    return actions;
   }
 
   /**