add json links columns to allow search.

seuros · seuros · commit 331cbd01240a · 2015-07-26T20:10:16.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -123,6 +123,7 @@ source 'https://rubygems.org' do
   gem 'test-unit'
   gem 'foreigner'
   gem 'state_machine'
+  gem 'activerecord-postgres-json'
 
 # ElasticSearch client
   gem 'tire'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,6 +24,9 @@ GEM
       activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    activerecord-postgres-json (0.2.1)
+      activerecord (>= 3.2, < 4)
+      multi_json
     activeresource (3.2.22)
       activemodel (= 3.2.22)
       activesupport (= 3.2.22)
@@ -689,6 +692,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-postgres-json!
   acts-as-taggable-on (~> 3.4)!
   acts_as_follower (= 0.1.1)!
   annotate!
diff --git a/app/models/skill.rb b/app/models/skill.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  user_id            :integer
-#  name               :string(255)      not null
+#  name               :citext           not null
 #  endorsements_count :integer          default(0)
 #  created_at         :datetime
 #  updated_at         :datetime
@@ -15,6 +15,7 @@
 #  attended_events    :text
 #  deleted            :boolean          default(FALSE), not null
 #  deleted_at         :datetime
+#  links              :json             default("{}")
 #
 
 class Skill < ActiveRecord::Base
@@ -23,7 +24,7 @@ class Skill < ActiveRecord::Base
   SPACE = ' '
   BLANK = ''
 
-  belongs_to :user
+  belongs_to :user, touch: true
   has_many :endorsements
 
   validates_presence_of :tokenized
@@ -38,8 +39,11 @@ class Skill < ActiveRecord::Base
   serialize :repos, Array
   serialize :attended_events, Array
   serialize :speaking_events, Array
+  serialize :links,  ActiveRecord::Coders::JSON
+
 
   default_scope where(deleted: false)
+  scope :deleted, ->{unscoped.where(deleted: true)}
 
   def self.tokenize(value)
     v = value.to_s.gsub('&', 'and').downcase.gsub(/\s|\./, BLANK)
@@ -48,19 +52,19 @@ def self.tokenize(value)
   end
 
   def self.deleted?(user_id, skill_name)
-    Skill.with_deleted.where(user_id: user_id, name: skill_name, deleted: true).any?
-  end
-
-  def merge_with(another_skill)
-    if another_skill.user_id == self.user_id
-      another_skill.endorsements.each do |endorsement|
-        self.endorsed_by(endorsement.endorser)
-      end
-      self.repos           += another_skill.repos
-      self.attended_events += another_skill.attended_events
-      self.speaking_events += another_skill.speaking_events
-    end
-  end
+    deleted.where(user_id: user_id, name: skill_name).any?
+  end
+
+  # def merge_with(another_skill)
+  #   if another_skill.user_id == self.user_id
+  #     another_skill.endorsements.each do |endorsement|
+  #       self.endorsed_by(endorsement.endorser)
+  #     end
+  #     self.repos           += another_skill.repos
+  #     self.attended_events += another_skill.attended_events
+  #     self.speaking_events += another_skill.speaking_events
+  #   end
+  # end
 
   def endorsed_by(endorser)
     # endorsed is only in here during migration of endorsement to skill
diff --git a/db/migrate/20150726135616_convert_skills_columns_to_database_json.rb b/db/migrate/20150726135616_convert_skills_columns_to_database_json.rb
@@ -0,0 +1,5 @@
+class ConvertSkillsColumnsToDatabaseJson < ActiveRecord::Migration
+  def up
+    add_column :skills, :links, :json, default: '{}'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150726134416) do
+ActiveRecord::Schema.define(:version => 20150726135616) do
 
   add_extension "citext"
   add_extension "hstore"
@@ -266,6 +266,7 @@
     t.text     "attended_events"
     t.boolean  "deleted",            :default => false, :null => false
     t.datetime "deleted_at"
+    t.json     "links",               :default => "{}"
   end
 
   add_index "skills", ["deleted", "user_id"], :name => "index_skills_on_deleted_and_user_id"
diff --git a/spec/fabricators/skill_fabricator.rb b/spec/fabricators/skill_fabricator.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  user_id            :integer
-#  name               :string(255)      not null
+#  name               :citext           not null
 #  endorsements_count :integer          default(0)
 #  created_at         :datetime
 #  updated_at         :datetime
@@ -15,6 +15,7 @@
 #  attended_events    :text
 #  deleted            :boolean          default(FALSE), not null
 #  deleted_at         :datetime
+#  links              :json             default("{}")
 #
 
 Fabricator(:skill) do
diff --git a/spec/models/skill_spec.rb b/spec/models/skill_spec.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  user_id            :integer
-#  name               :string(255)      not null
+#  name               :citext           not null
 #  endorsements_count :integer          default(0)
 #  created_at         :datetime
 #  updated_at         :datetime
@@ -15,6 +15,7 @@
 #  attended_events    :text
 #  deleted            :boolean          default(FALSE), not null
 #  deleted_at         :datetime
+#  links              :json             default("{}")
 #
 
 require 'vcr_helper'

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +class ConvertSkillsColumnsToDatabaseJson < ActiveRecord::Migration
 +  def up
 +    add_column :skills, :links, :json, default: '{}'
 +  end
 +end