Merge pull request #321 from spira/hotfix/meta-hydration

Now hydrating all meta tags in article correctly, updating tests.
spira · Dec 9, 2015 · 0ec4cad · 0ec4cad
2 parents 157867d + 150341a
commit 0ec4cad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/app/src/common/models/article/articleModel.spec.ts b/app/src/common/models/article/articleModel.spec.ts
@@ -66,15 +66,15 @@ namespace common.models {
 
             let article = new common.models.Article(articleData);
 
-            // The first article meta is 'name' which is added via template
-            expect(article._metas[0].metaableId).to.equal(article.postId);
-            expect(_.isEmpty(article._metas[0].metaId)).to.be.false;
-
-            let testableMetaTags = _.cloneDeep(article._metas);
-            _.forEach(testableMetaTags, (tag) => {
-                delete(tag.metaId);
-                delete(tag.metaableId);
-                delete(tag.metaableType);
+            let testableMetaTags = _.map(article._metas, (metaTag) => {
+                expect(metaTag).to.be.an.instanceOf(Meta);
+                expect(metaTag.metaableId).to.equal(article.postId);
+                expect(_.isEmpty(metaTag.metaId)).to.be.false;
+
+                return {
+                    metaName: metaTag.metaName,
+                    metaContent: metaTag.metaContent
+                };
             });
 
             expect(testableMetaTags).to.deep.equal([

diff --git a/app/src/common/models/article/articleModel.ts b/app/src/common/models/article/articleModel.ts
@@ -95,21 +95,27 @@ namespace common.models {
             return (<any>_).chain(common.models.Article.articleMetaTemplate)
                 .map((metaTagName) => {
 
-                    let existingTag = _.find((<common.models.Article>data)._metas, {metaName:metaTagName});
-                    if(_.isEmpty(existingTag)) {
+                    let existingTagData = _.find((<common.models.Article>data)._metas, {metaName:metaTagName});
+                    if(_.isEmpty(existingTagData)) {
                         return new common.models.Meta({
                             metaName:metaTagName,
                             metaContent:'',
                             metaableId:(<common.models.Article>data).postId,
                             metaId:common.models.Article.generateUUID()
                         });
                     }
-                    return existingTag;
+
+                    return new common.models.Meta(existingTagData);
                 })
                 .thru((templateMeta) => {
-                    let leftovers = _.filter((<common.models.Article>data)._metas, (metaTag) => {
-                        return !_.contains(templateMeta, metaTag);
-                    });
+
+                    let leftovers = _.reduce((<common.models.Article>data)._metas, (metaTags:common.models.Meta[], metaTagData) => {
+                        if(!_.find(templateMeta, {metaName:metaTagData.metaName})) {
+                            metaTags.push(new common.models.Meta(metaTagData));
+                        }
+
+                        return metaTags;
+                    }, []);
 
                     return templateMeta.concat(leftovers);
                 })