From d34cbc7870206717c66f461bdb24bbfca8718980 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 28 Nov 2016 10:19:33 -0700
Subject: [PATCH] Moved the action insert into the action model.

---
 models/action.js  | 29 +++++++++++++++++++++++++++++
 models/comment.js | 30 ++++++++----------------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/models/action.js b/models/action.js
index 48c0a9a18..891dbd4f5 100644
--- a/models/action.js
+++ b/models/action.js
@@ -27,6 +27,35 @@ ActionSchema.statics.findById = function(id) {
   return Action.findOne({id});
 };
 
+/**
+ * Add an action.
+ * @param {String} item_id  identifier of the comment  (uuid)
+ * @param {String} user_id  user id of the action (uuid)
+ * @param {String} action the new action to the comment
+ * @return {Promise}
+ */
+ActionSchema.statics.insertUserAction = ({item_id, item_type, user_id, action_type}) => {
+  const action = {
+    item_id,
+    item_type,
+    user_id,
+    action_type
+  };
+
+  // Create/Update the action.
+  return Action.findOneAndUpdate(action, action, {
+
+    // Ensure that if it's new, we return the new object created.
+    new: true,
+
+    // Perform an upsert in the event that this doesn't exist.
+    upsert: true,
+
+    // Set the default values if not provided based on the mongoose models.
+    setDefaultsOnInsert: true
+  });
+};
+
 /**
  * Finds actions in an array of ids.
  * @param {String} ids array of user identifiers (uuid)
diff --git a/models/comment.js b/models/comment.js
index 73f8250d7..c1a32cf1b 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -157,31 +157,17 @@ CommentSchema.statics.changeStatus = function(id, status) {
 
 /**
  * Add an action to the comment.
- * @param {String} id  identifier of the comment  (uuid)
+ * @param {String} item_id  identifier of the comment  (uuid)
+ * @param {String} user_id  user id of the action (uuid)
  * @param {String} action the new action to the comment
  * @return {Promise}
  */
-CommentSchema.statics.addAction = function(item_id, user_id, action_type) {
-  const action = {
-    item_id,
-    item_type: 'comment',
-    user_id,
-    action_type
-  };
-
-  // Update/Create the action for the user.
-  return Action.findOneAndUpdate(action, action, {
-
-    // Ensure that if it's new, we return the new object created.
-    new: true,
-
-    // Perform an upsert in the event that this doesn't exist.
-    upsert: true,
-
-    // Set the default values if not provided based on the mongoose models.
-    setDefaultsOnInsert: true
-  });
-};
+CommentSchema.statics.addAction = (item_id, user_id, action_type) => Action.insertUserAction({
+  item_id,
+  item_type: 'comment',
+  user_id,
+  action_type
+});
 
 //==============================================================================
 // Remove Statics