add column Kind for tag TryGhost#5

core/server/data/finpub/company.js

@@ -12,7 +12,6 @@ delete val;
 
 const CompanyHandler = {
     get: function(code) {
-        console.log('check code ', code, companies[code]);
         if (code) {
             return companies[code.toLowerCase()];
         }

core/server/data/migrations/versions/2.31/4-add-type-column-to-tag-table.js

@@ -0,0 +1,40 @@
+const common = require('../../../../lib/common');
+const commands = require('../../../schema').commands;
+const table = 'tags';
+const newColumnNames = [
+    'kind',
+];
+
+function printResult(operation, columnName) {
+    return `${operation} column ${columnName} in ${table} table`;
+}
+
+module.exports.up = (options) => {
+    const connection = options.connection;
+    return Promise.map(newColumnNames, (newColumnName) => {
+        return connection.schema.hasColumn(table, newColumnName)
+            .then((exists) => {
+                if (exists) {
+                    common.logging.warn(printResult('Adding', newColumnName));
+                    return;
+                }
+                common.logging.info(printResult('Adding', newColumnName));
+                return commands.addColumn(table, newColumnName, connection);
+            });
+    });
+};
+
+module.exports.down = (options) => {
+    const connection = options.connection;
+    return Promise.map(newColumnNames, (newColumnName) => {
+        return connection.schema.hasColumn(table, newColumnName)
+            .then((exists) => {
+                if (!exists) {
+                    common.logging.warn(printResult('Dropping', newColumnName));
+                    return;
+                }
+                common.logging.info(printResult('Dropping', newColumnName));
+                return commands.dropColumn(table, newColumnName, connection);
+            });
+    });
+};

core/server/data/schema/schema.js

@@ -175,7 +175,8 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_by: {type: 'string', maxlength: 24, nullable: true},
+        kind: {type: 'integer', nullable: true, unsigned: true, defaultTo: 0}
     },
     posts_tags: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},

core/server/models/tag.js

@@ -1,6 +1,10 @@
 const ghostBookshelf = require('./base');
 const CompanyHelper = require('../data/finpub/company');
 
+const TagTypes = {
+    Company: 1
+}
+
 let Tag, Tags;
 
 Tag = ghostBookshelf.Model.extend({
@@ -92,7 +96,6 @@ Tag = ghostBookshelf.Model.extend({
     onCreating: function onCreating(model, attr, options) {
         // overwrite onCreating to automatically add meta_title 
         // and meta_description
-        console.log('----------------------------> on creating tag ', this.get('name'));  
         let company = CompanyHelper.get(this.get('name'));
         if (company) {
 
@@ -107,6 +110,10 @@ Tag = ghostBookshelf.Model.extend({
             if (!options.importing || (options.importing && !this.get('description'))) {
                 this.set('description', String(company.name) + ' (' + company.exchange + ')');
             }
+
+            if (!options.importing || (options.importing && !this.get('kind'))) {
+                this.set('kind', TagTypes.Company);
+            }
         }
 
         // call parent