2 files changed, 67 insertions, 2 deletions

diff --git a/server/models/author.js b/server/models/author.js
index 5835ada99..7d15fb6ec 100644
--- a/server/models/author.js
+++ b/server/models/author.js
@@ -29,7 +29,9 @@ module.exports = function (sequelize, DataTypes) {
         }
       ],
       classMethods: {
-        associate
+        associate,
+
+        findOrCreateAuthor
       }
     }
   )
@@ -56,3 +58,28 @@ function associate (models) {
     onDelete: 'cascade'
   })
 }
+
+function findOrCreateAuthor (name, podId, userId, transaction, callback) {
+  if (!callback) {
+    callback = transaction
+    transaction = null
+  }
+
+  const author = {
+    name,
+    podId,
+    userId
+  }
+
+  const query = {
+    where: author,
+    defaults: author
+  }
+
+  if (transaction) query.transaction = transaction
+
+  this.findOrCreate(query).asCallback(function (err, result) {
+    // [ instance, wasCreated ]
+    return callback(err, result[0])
+  })
+}
diff --git a/server/models/tag.js b/server/models/tag.js
index 27eecdc84..145e090c1 100644
--- a/server/models/tag.js
+++ b/server/models/tag.js
@@ -1,5 +1,7 @@
 'use strict'
 
+const each = require('async/each')
+
 // ---------------------------------------------------------------------------
 
 module.exports = function (sequelize, DataTypes) {
@@ -19,7 +21,9 @@ module.exports = function (sequelize, DataTypes) {
         }
       ],
       classMethods: {
-        associate
+        associate,
+
+        findOrCreateTags
       }
     }
   )
@@ -36,3 +40,37 @@ function associate (models) {
     onDelete: 'cascade'
   })
 }
+
+function findOrCreateTags (tags, transaction, callback) {
+  if (!callback) {
+    callback = transaction
+    transaction = null
+  }
+
+  const self = this
+  const tagInstances = []
+
+  each(tags, function (tag, callbackEach) {
+    const query = {
+      where: {
+        name: tag
+      },
+      defaults: {
+        name: tag
+      }
+    }
+
+    if (transaction) query.transaction = transaction
+
+    self.findOrCreate(query).asCallback(function (err, res) {
+      if (err) return callbackEach(err)
+
+      // res = [ tag, isCreated ]
+      const tag = res[0]
+      tagInstances.push(tag)
+      return callbackEach()
+    })
+  }, function (err) {
+    return callback(err, tagInstances)
+  })
+}