Merge pull request #1927 from schneidmaster/fix-1907

Fixed issue with adding multiple new tags to a post

core/server/models/post.js

@@ -115,7 +115,8 @@ Post = ghostBookshelf.Model.extend({
             var existingTags = thisPostWithTags.related('tags').toJSON(),
                 tagOperations = [],
                 tagsToDetach = [],
-                tagsToAttach = [];
+                tagsToAttach = [],
+                createdTagsToAttach = [];
 
             // First find any tags which have been removed
             _.each(existingTags, function (existingTag) {
@@ -143,23 +144,45 @@ Post = ghostBookshelf.Model.extend({
                         tagsToAttach = _.reject(tagsToAttach, function (tagToAttach) {
                             return tagToAttach.name === matchingTag.name;
                         });
+
                     });
 
+                    // Return if no tags to add
+                    if (tagsToAttach.length === 0) {
+                        return;
+                    }
+
+                    // Set method to insert, so each tag gets inserted with the appropriate options
+                    var opt = options.method;
+                    options.method = 'insert';
+
+                    // Create each tag that doesn't yet exist
                     _.each(tagsToAttach, function (tagToCreateAndAttach) {
-                        var createAndAttachOperation,
+                        var createAndAttachOperation = Tag.add({name: tagToCreateAndAttach.name}, options).then(function (createdTag) {
-                            opt = options.method;
+                            createdTagsToAttach.push(createdTag);
-                        //TODO: remove when refactor; ugly fix to overcome bookshelf
+
-                        options.method = 'insert';
+                            // If the tags are all inserted, process them
-                        createAndAttachOperation = Tag.add({name: tagToCreateAndAttach.name}, options).then(function (createdTag) {
+                            if (tagsToAttach.length === createdTagsToAttach.length) {
-                            options.method = opt;
+
-                            return self.tags().attach(createdTag.id, createdTag.name, options);
+                                // Set method back to whatever it was, for tag attachment
+                                options.method = opt;
+
+                                // Attach each newly created tag
+                                _.each(createdTagsToAttach, function (tagToAttach) {
+                                    self.tags().attach(tagToAttach.id, tagToAttach.name, options);
+                                });
+
+                            }
+
                         });
 
-
                         tagOperations.push(createAndAttachOperation);
+
                     });
 
+                    // Return when all tags attached
                     return when.all(tagOperations);
+
                 });
             }
 
@@ -381,10 +404,7 @@ Post = ghostBookshelf.Model.extend({
         var self = this;
 
         return ghostBookshelf.Model.edit.call(this, editedPost, options).then(function (editedObj) {
-            return when(editedObj.updateTags(editedPost.tags, null, options)).then(function () {
+            return self.findOne({status: 'all', id: editedObj.id}, options);
-                return self.findOne({status: 'all', id: editedObj.id}, options);
-            });
-            //return self.findOne({status: 'all', id: editedObj.id}, options);
         });
     },
     destroy: function (_identifier, options) {
@@ -411,4 +431,4 @@ Posts = ghostBookshelf.Collection.extend({
 module.exports = {
     Post: Post,
     Posts: Posts
-};
+};

core/test/integration/model/model_tags_spec.js

@@ -185,7 +185,7 @@ describe('Tag Model', function () {
                 }).then(null, done);
             });
 
-            it('creates and attaches tags that are new to the Tags table', function (done) {
+            it('creates and attaches a tag that is new to the Tags table', function (done) {
                 var seededTagNames = ['tag1', 'tag2'];
 
                 seedTags(seededTagNames).then(function (postModel) {
@@ -205,6 +205,87 @@ describe('Tag Model', function () {
                 }).then(null, done);
             });
 
+            it('creates and attaches multiple tags that are new to the Tags table', function (done) {
+                var seededTagNames = ['tag1'];
+
+                seedTags(seededTagNames).then(function (postModel) {
+                    // the tag API expects tags to be provided like {id: 1, name: 'draft'}
+                    var tagData = seededTagNames.map(function (tagName, i) { return {id: i + 1, name: tagName}; });
+
+                    // add the additional tags, and save
+                    tagData.push({id: null, name: 'tag2'});
+                    tagData.push({id: null, name: 'tag3'});
+                    return postModel.set('tags', tagData).save();
+                }).then(function (postModel) {
+                    return PostModel.read({id: postModel.id, status: 'all'}, { withRelated: ['tags']});
+                }).then(function (reloadedPost) {
+                    var tagNames = reloadedPost.related('tags').models.map(function (t) { return t.attributes.name; });
+                    tagNames.sort().should.eql(['tag1', 'tag2', 'tag3']);
+
+                    done();
+                }).then(null, done);
+            });
+
+            it('attaches one tag that exists in the Tags database and one tag that is new to the Tags database', function (done) {
+                var seededTagNames = ['tag1'],
+                    postModel;
+
+                seedTags(seededTagNames).then(function (_postModel) {
+                    postModel = _postModel;
+                    return TagModel.add({name: 'tag2'});
+                }).then(function () {
+                    // the tag API expects tags to be provided like {id: 1, name: 'draft'}
+                    var tagData = seededTagNames.map(function (tagName, i) { return {id: i + 1, name: tagName}; });
+
+                    // Add the tag that exists in the database
+                    tagData.push({id: 2, name: 'tag2'});
+
+                    // Add the tag that doesn't exist in the database
+                    tagData.push({id: 3, name: 'tag3'});
+
+                    return postModel.set('tags', tagData).save();
+                }).then(function () {
+                    return PostModel.read({id: postModel.id, status: 'all'}, { withRelated: ['tags']});
+                }).then(function (reloadedPost) {
+                    var tagModels = reloadedPost.related('tags').models,
+                        tagNames = tagModels.map(function (t) { return t.attributes.name; });
+                    tagNames.sort().should.eql(['tag1', 'tag2', 'tag3']);
+                    tagModels[2].id.should.eql(4); // make sure it hasn't just added a new tag with the same name
+
+                    done();
+                }).then(null, done);
+            });
+
+            it('attaches one tag that exists in the Tags database and two tags that are new to the Tags database', function (done) {
+                var seededTagNames = ['tag1'],
+                    postModel;
+
+                seedTags(seededTagNames).then(function (_postModel) {
+                    postModel = _postModel;
+                    return TagModel.add({name: 'tag2'});
+                }).then(function () {
+                    // the tag API expects tags to be provided like {id: 1, name: 'draft'}
+                    var tagData = seededTagNames.map(function (tagName, i) { return {id: i + 1, name: tagName}; });
+
+                    // Add the tag that exists in the database
+                    tagData.push({id: 2, name: 'tag2'});
+
+                    // Add the tags that doesn't exist in the database
+                    tagData.push({id: 3, name: 'tag3'});
+                    tagData.push({id: 4, name: 'tag4'});
+
+                    return postModel.set('tags', tagData).save();
+                }).then(function () {
+                    return PostModel.read({id: postModel.id, status: 'all'}, { withRelated: ['tags']});
+                }).then(function (reloadedPost) {
+                    var tagModels = reloadedPost.related('tags').models,
+                        tagNames = tagModels.map(function (t) { return t.attributes.name; });
+                    tagNames.sort().should.eql(['tag1', 'tag2', 'tag3', 'tag4']);
+                    tagModels[2].id.should.eql(4); // make sure it hasn't just added a new tag with the same name
+
+                    done();
+                }).then(null, done);
+            });
 
             it('can add a tag to a post on creation', function (done) {
                 var newPost = _.extend(testUtils.DataGenerator.forModel.posts[0], {tags: [{name: 'test_tag_1'}]})
@@ -221,4 +302,4 @@ describe('Tag Model', function () {
 
     });
 
-});
+});