Introduces the Followable concert

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com>

Introduces the Followable concert
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Gabriel Silva
1 parent f8e47f31
Showing 7 changed files with 59 additions and 47 deletions Show diff stats
app/models/concerns/followable.rb
app/models/concerns/follower.rb
app/models/external_person.rb
app/models/person.rb
app/models/profile.rb
db/schema.rb
test/unit/follower_test.rb
@@ -0,0 +1,18 @@
+module Followable
+  extend ActiveSupport::Concern
+
+  def followers
+    person_followers = Person.joins(:owned_circles).merge(circles).uniq
+    external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
+
+    person_followers + external_person_followers
+  end
+
+  def followed_by?(person)
+    (person == self) || (person.in? self.followers)
+  end
+
+  def in_circle?(circle)
+    circle.in? self.circles
+  end
+end
@@ -4,14 +4,14 @@ module Follower
   def follow(profile, circles)
     circles = [circles] unless circles.is_a?(Array)
     circles.each do |new_circle|
-      next if new_circle.owner != self || new_circle.profile_type != profile.class.name
+      next if new_circle.owner != self || !profile.kind_of?(new_circle.profile_type.constantize)
       ProfileFollower.create(profile: profile, circle: new_circle)
     end
   end
   def follows?(profile)
     return false if profile.nil?
-    p profile.followed_by?(self)
+    profile.followed_by?(self)
   end
   def unfollow(profile)
@@ -19,7 +19,10 @@ module Follower
   end
   def followed_profiles
-    Profile.followed_by self
+    external_people = ExternalPerson.joins(:circles).where("circles.owner_id = ?", self.id)
+    profiles = Profile.joins(:circles).where("circles.owner_id = ?", self.id)
+
+    external_people.uniq + profiles.uniq
   end
   def update_profile_circles(profile, new_circles)
@@ -37,4 +40,8 @@ module Follower
     ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
   end
+  def in_circle?(circle)
+    circle.in? self.circles
+  end
+
 end
@@ -4,9 +4,10 @@ class ExternalPerson &lt; ActiveRecord::Base
   include Human
   include ProfileEntity
   include Follower
+  include Followable
-  has_many :profile_followers
-  has_many :circles, :through => :profile_followers, :as => :profile
+  has_many :profile_followers, :as => :profile
+  has_many :circles, :through => :profile_followers
   has_many :owned_circles, as: :owner, :class_name => "Circle"
   validates_uniqueness_of :identifier, scope: :source
@@ -204,7 +205,7 @@ class ExternalPerson &lt; ActiveRecord::Base
      each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,
      leave: nil, last_notification: nil, notification_time: 0, notifier: nil,
      remove_suggestion: nil, allow_invitation_from?: false, in_social_circle?: false,
-     allow_followers: false, in_circles: Circle.none, followers: [], in_circle?: false
+     allow_followers: false
     }
     derivated_methods = generate_derivated_methods(methods_and_responses)
@@ -258,7 +259,7 @@ class ExternalPerson &lt; ActiveRecord::Base
      more_popular_label: _('no members'), profile_custom_image: nil,
      is_on_homepage?: false, activities: ProfileActivity.none,
      may_display_field_to?: true, may_display_location_to?: true, public_fields:
-     {}, followed_by?: false, display_private_info_to?: true, can_view_field?:
+     {}, display_private_info_to?: true, can_view_field?:
      true, remove_from_suggestion_list: nil, layout_template: 'default',
      is_admin?: false, add_friend: false, is_a_friend?: false,
      already_request_friendship?: false, tracked_actions: ActionTracker::Record.none
@@ -275,6 +276,7 @@ class ExternalPerson &lt; ActiveRecord::Base
     if profile_instance_methods.keys.include? method
       return profile_instance_methods[method]
     end
+    super
   end
   def respond_to_missing?(method_name, include_private = false)
@@ -283,6 +285,10 @@ class ExternalPerson &lt; ActiveRecord::Base
     super
   end
+  def kind_of?(klass)
+    (klass == Person) ? true : super
+  end
+
   private
   def generate_derivated_methods(methods)
@@ -570,10 +570,6 @@ class Person &lt; Profile
     }
   end
-  def followed_profiles
-    Profile.followed_by self
-  end
-
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
@@ -4,6 +4,7 @@
 class Profile < ApplicationRecord
   include ProfileEntity
+  include Followable
   attr_accessible :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
     :custom_url_redirection, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification, :redirection_after_login, :allow_followers
@@ -219,13 +220,6 @@ class Profile &lt; ApplicationRecord
   scope :more_active, -> { order 'activities_count DESC' }
   scope :more_recent, -> { order "created_at DESC" }
-  scope :followed_by, -> person{
-    distinct.select('profiles.*').
-    joins('left join profiles_circles ON profiles_circles.profile_id = profiles.id').
-    joins('left join circles ON circles.id = profiles_circles.circle_id').
-    where('circles.owner_id = ?', person.id)
-  }
-
   settings_items :allow_followers, :type => :boolean, :default => true
   alias_method :allow_followers?, :allow_followers
@@ -241,15 +235,8 @@ class Profile &lt; ApplicationRecord
   has_many :email_templates, :foreign_key => :owner_id
-  has_many :profile_followers
-  has_many :circles, :through => :profile_followers, :as => :profile
-
-  def followers
-    person_followers = Person.joins(:owned_circles).merge(circles).uniq
-    external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
-
-    person_followers + external_person_followers
-  end
+  has_many :profile_followers, :as => :profile
+  has_many :circles, :through => :profile_followers
   # has_many :followers, -> { uniq }, :through => :profile_followers, :source => :person
@@ -1010,10 +997,6 @@ private :generate_url, :url_options
     self.active_fields
   end
-  def followed_by?(person)
-    (person == self) || (person.in? self.followers)
-  end
-
   def in_social_circle?(person)
     (person == self) || (person.is_member_of?(self))
   end
@@ -1057,7 +1040,4 @@ private :generate_url, :url_options
     person.kind_of?(Profile) && person.has_permission?('destroy_profile', self)
   end
-  def in_circle?(circle)
-    circle.in? self.circles
-  end
 end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160608123748) do
+ActiveRecord::Schema.define(version: 20160822184703) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -277,11 +277,13 @@ ActiveRecord::Schema.define(version: 20160608123748) do
   create_table "circles", force: :cascade do |t|
     t.string  "name"
-    t.integer "person_id"
-    t.string  "profile_type", null: false
+    t.integer "owner_id"
+    t.string  "profile_type",                    null: false
+    t.string  "owner_type",   default: "Person"
   end
-  add_index "circles", ["person_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "owner_type"], name: "index_circles_on_owner_id_and_owner_type", using: :btree
   create_table "comments", force: :cascade do |t|
     t.string   "title"
@@ -553,6 +555,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.datetime "updated_at"
   end
+  create_table "private_scraps", force: :cascade do |t|
+    t.integer "person_id"
+    t.integer "scrap_id"
+  end
+
   create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
@@ -681,9 +688,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.integer  "circle_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "profile_type", default: "Person"
   end
   add_index "profiles_circles", ["profile_id", "circle_id"], name: "profiles_circles_composite_key_index", unique: true, using: :btree
+  add_index "profiles_circles", ["profile_id", "profile_type"], name: "index_profiles_circles_on_profile_id_and_profile_type", using: :btree
   create_table "qualifier_certifiers", force: :cascade do |t|
     t.integer "qualifier_id"
@@ -150,14 +150,10 @@ class FollowerTest &lt; ActiveSupport::TestCase
     assert_equivalent [@circle1, @circle2], @person2.circles
   end
-  should 'external person be followable' do
-    person = fast_create(Person, :environment_id => Environment.default.id)
-    circle = Circle.create(owner: @external_person, profile_type: "Person", name: "FRIENDSSS")
-    pf = ProfileFollower.create(profile: @external_person, circle: circle)
-    assert person.follows? @external_person
-
-    # assert_difference 'ProfileFollower.all.count' do
-    #   person.follow(@external_person, circle)
-    # end
+  should 'follow External Person' do
+    assert_difference 'ProfileFollower.count' do
+      @person1.follow(@external_person, @circle1)
+    end
+    assert @person1.follows? @external_person
   end
 end
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+module Followable
	2	+ extend ActiveSupport::Concern
	3	+
	4	+ def followers
	5	+ person_followers = Person.joins(:owned_circles).merge(circles).uniq
	6	+ external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
	7	+
	8	+ person_followers + external_person_followers
	9	+ end
	10	+
	11	+ def followed_by?(person)
	12	+ (person == self) \|\| (person.in? self.followers)
	13	+ end
	14	+
	15	+ def in_circle?(circle)
	16	+ circle.in? self.circles
	17	+ end
	18	+end