chore: extract string from usage object to match what db needs

Author: ztsorojev

api/models/Topic.js

@@ -22,39 +22,39 @@ module.exports = {
     },
 
     description: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     usage: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     details: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     value: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     references: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     note: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     author: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     seealso: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     examples: {
-      type: Sequelize.TEXT,
+      type: Sequelize.TEXT
     },
 
     sourceJSON: {
@@ -65,7 +65,6 @@ module.exports = {
 
   },
   associations: function() {
-
     Topic.belongsTo(PackageVersion,
       {
         as: 'package_version',
@@ -115,7 +114,7 @@ module.exports = {
             .replace(':version', encodeURIComponent(this.package_version.version))
             .replace(':topic', encodeURIComponent(this.name))
             .replace('/api/', '/');
-        } else return sails.getUrlFor({ target: 'Topic.findById' })
+        } return sails.getUrlFor({ target: 'Topic.findById' })
           .replace(':id', encodeURIComponent(this.id))
           .replace('/api/', '/');
       },
@@ -125,9 +124,9 @@ module.exports = {
             .replace(':name', encodeURIComponent(this.package_version.package_name))
             .replace(':version', encodeURIComponent(this.package_version.version))
             .replace(':topic', encodeURIComponent(this.name));
-        } else return sails.getUrlFor({ target: 'Topic.findById' })
+        } return sails.getUrlFor({ target: 'Topic.findById' })
           .replace(':id', encodeURIComponent(this.id));
-      },
+      }
     },
 
     classMethods: {
@@ -140,8 +139,8 @@ module.exports = {
         var options = _.mergeWith({
           where: criteria,
           include: [
-            {model: Argument, as: 'arguments', attributes: ['name', 'description', 'topic_id'], separate:true },
-            {model: Section, as: 'sections', attributes: ['name', 'description', 'topic_id'], separate:true },
+            {model: Argument, as: 'arguments', attributes: ['name', 'description', 'topic_id'], separate: true },
+            {model: Section, as: 'sections', attributes: ['name', 'description', 'topic_id'], separate: true },
             {model: Tag, as: 'keywords', attributes: ['name']},
             {model: Alias, as: 'aliases', attributes: ['name', 'topic_id'], separate: true },
             {model: Example, as: 'user_examples',
@@ -162,23 +161,24 @@ module.exports = {
           package_name: packageName
         };
 
-        if(version) { //if version is specified, find in this one
+        if (version) { // if version is specified, find in this one
           packageCriteria.version = version;
         }
 
         var params = {
           where: { name: name },
           include: [
             { model: PackageVersion, as: 'package_version', attributes: ['package_name', 'version'], where: packageCriteria }
-          ],
+          ]
         };
 
         return Promise.join(
           Topic.findAll(params),
           Topic.findByAliasInPackage(packageName, name, version),
         function(topics, aliasesTopics) {
           return topics.concat(aliasesTopics).sort(PackageService.compareVersions('desc', function(topic) {
-            return topic.package_version.version })
+            return topic.package_version.version;
+          })
           )[0];
         });
       },
@@ -188,7 +188,7 @@ module.exports = {
           package_name: packageName
         };
 
-        if(version) { //if version is specified, find in this one
+        if (version) { // if version is specified, find in this one
           packageCriteria.version = version;
         }
 
@@ -200,16 +200,19 @@ module.exports = {
         };
 
         return Topic.findAll(params).then(function(topicInstances) {
-          if(topicInstances) return topicInstances.sort(PackageService.compareVersions('desc', function(topic) {
-            return topic.package_version.version })
+          if (topicInstances) {
+            return topicInstances.sort(PackageService.compareVersions('desc', function(topic) {
+              return topic.package_version.version;
+            })
           )[0];
-          else return topicInstances;
+          }
+          return topicInstances;
         });
       },
 
       createWithRdFile: function(opts) {
         var rdJSON = opts.input;
-        return sequelize.transaction(function (t) {
+        return sequelize.transaction(function(t) {
           var attributes = [
             'name',
             'title',
@@ -225,11 +228,15 @@ module.exports = {
 
           var topic = _.pick(rdJSON, attributes);
 
+          if (topic.usage !== null && typeof topic.usage === 'object') {
+            topic.usage = topic.usage.contents;
+          }
+
           var arrayToString = function(val) {
             if (val instanceof Array) {
-              if(_.isEmpty(val)) return "";
-              else return val.join("\n\n");
-            } else return val;
+              if (_.isEmpty(val)) return '';
+              return val.join('\n\n');
+            } return val;
           };
 
           topic = _.mapValues(topic, arrayToString);
@@ -245,14 +252,13 @@ module.exports = {
           var packageVersion = {
             package_name: opts.packageName,
             version: opts.packageVersion,
-            description: "",
-            license: ""
+            description: '',
+            license: ''
           };
 
           return PackageVersion.upsertPackageVersion(packageVersion, {
             transaction: t
           }).spread(function(version, created) {
-
             topic.package_version_id = version.id;
 
 
@@ -281,12 +287,12 @@ module.exports = {
                   {model: Alias, as: 'aliases'}
                 ]
               }),
-              Tag.bulkCreate(keywordsRecords, {transaction:t, ignoreDuplicates: true})
+              Tag.bulkCreate(keywordsRecords, {transaction: t, ignoreDuplicates: true})
               .then(function(instances) {
-                var names = _.map(instances, function (inst) {
+                var names = _.map(instances, function(inst) {
                   return inst.name;
                 });
-                return Tag.findAll({where: {name: {$in: names}}, transaction:t });
+                return Tag.findAll({where: {name: {$in: names}}, transaction: t });
               }),
               function(instanceCreatedArray, keywordsInstances) {
                 var topicInstance = instanceCreatedArray[0];
@@ -329,11 +335,9 @@ module.exports = {
                   topicInstance.setKeywords(keywordsInstances, {transaction: t }),
                   topicInstance.save({transaction: t})
                 ]).then(_.partial(Topic.findOnePopulated, {id: topicInstance.id}, {transaction: t}));
-            });
+              });
           });
-
         });
-
       }
     }
   }