Start following for external noosfero users

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

Start following for external noosfero users
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Dylan Guedes
1 parent f919a26e
Showing 9 changed files with 53 additions and 5 deletions Show diff stats
app/controllers/concerns/needs_profile.rb
app/models/circle.rb
app/models/external_person.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_follower.rb
db/migrate/20160810131138_adds_person_type_to_circles.rb
db/migrate/20160810132802_add_profile_type_to_profile_followers.rb
vendor/plugins/action_tracker/lib/action_tracker.rb
@@ -32,6 +32,8 @@ module NeedsProfile
         params.delete(:profile)
         redirect_to(Noosfero.url_options.merge(params).merge(:host => profile_hostname))
       end
+    elsif session[:external]
+      @profile = ExternalPerson.find(session[:external])
     else
       render_not_found
     end
 class Circle < ApplicationRecord
   has_many :profile_followers
-  belongs_to :person
+  belongs_to :person, polymorphic: true
   attr_accessible :name, :person, :profile_type
@@ -4,6 +4,8 @@ class ExternalPerson &lt; ActiveRecord::Base
   include Human
   include ProfileEntity
+  has_many :circles, as: :person
+  has_many :profile_followers, as: :profile
   validates_uniqueness_of :identifier, scope: :source
   validates_presence_of :source, :email, :created_at
@@ -277,6 +279,13 @@ class ExternalPerson &lt; ActiveRecord::Base
     super
   end
+  def follow(profile, circles)
+    circles = [circles] unless circles.is_a?(Array)
+    circles.each do |new_circle|
+      ProfileFollower.create(profile: profile, circle: new_circle)
+    end
+  end
+
   private
   def generate_derivated_methods(methods)
@@ -93,7 +93,7 @@ class Person &lt; Profile
   has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
-  has_many :circles
+  has_many :circles, as: :person
   scope :online, -> {
     joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
@@ -248,7 +248,7 @@ class Profile &lt; ApplicationRecord
   has_many :email_templates, :foreign_key => :owner_id
-  has_many :profile_followers
+  has_many :profile_followers, as: :profile
   has_many :followers, -> { uniq }, :class_name => 'Person', :through => :profile_followers, :source => :person
   # Although this should be a has_one relation, there are no non-silly names for
@@ -1009,6 +1009,7 @@ private :generate_url, :url_options
   end
   def followed_by?(person)
+    p "self: #{self}"
     (person == self) || (person.in? self.followers)
   end
@@ -4,10 +4,11 @@ class ProfileFollower &lt; ApplicationRecord
   attr_accessible :profile, :circle
-  belongs_to :profile
+  belongs_to :profile, polymorphic: :true
   belongs_to :circle
-  has_one :person, through: :circle
+  has_one :person, through: :circle, source_type: "ProfileFollower"
+
   alias follower person
   validates_presence_of :profile_id, :circle_id
@@ -25,4 +26,5 @@ class ProfileFollower &lt; ApplicationRecord
     where(:circle => circle)
   }
+
 end
@@ -0,0 +1,11 @@
+class AddsPersonTypeToCircles < ActiveRecord::Migration
+  def up
+    add_column :circles, :person_type, :string, default: "Person"
+    add_index :circles, [:person_id, :person_type]
+  end
+
+  def down
+    remove_column :circles, :person_type
+    remove_index :circles, [:person_id, :person_type]
+  end
+end
@@ -0,0 +1,11 @@
+class AddProfileTypeToProfileFollowers < ActiveRecord::Migration
+  def up
+    add_column :profiles_circles, :profile_type, :string, default: "Profile"
+    add_index :profiles_circles, [:profile_id, :profile_type]
+  end
+
+  def down
+    remove_column :profiles_circles, :profile_type
+    remove_index :profiles_circles, [:profile_id, :profile_type]
+  end
+end
@@ -95,8 +95,17 @@ module ActionTracker
         return nil if user.nil?
         if keep_params.is_a? Array
           stored_params = {}
+          p "&"*40
+          p "keep_params: #{keep_params}"
+          p "&"*40
           keep_params.each do |param|
             result = self
+            p "*"*40
+            p "result: #{result}"
+            p "result.follower:"
+            p result.circle.person
+            p "&"*40
+            p "*"*40
             param.to_s.split('.').each { |m| result = result.send(m) }
             stored_params[param.to_s.gsub(/\./, '_')] = result
           end
@@ -114,6 +123,9 @@ module ActionTracker
             Record.new :verb => verb, :params => stored_params, :user => user
         end
         tracked_action.target = target || self
+        p "*"*40
+        p "user: #{user}"
+        p "*"*40
         user.tracked_actions << tracked_action
         post_proc.call tracked_action
       end
1	class Circle < ApplicationRecord	1	class Circle < ApplicationRecord
2	has_many :profile_followers	2	has_many :profile_followers
3	- belongs_to :person	3	+ belongs_to :person, polymorphic: true
4		4
5	attr_accessible :name, :person, :profile_type	5	attr_accessible :name, :person, :profile_type
6		6
	@@ -93,7 +93,7 @@ class Person < Profile		@@ -93,7 +93,7 @@ class Person < Profile
93	has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article	93	has_many :following_articles, :class_name => 'Article', :through => :article_followers, :source => :article
94	has_many :friendships, :dependent => :destroy	94	has_many :friendships, :dependent => :destroy
95	has_many :friends, :class_name => 'Person', :through => :friendships	95	has_many :friends, :class_name => 'Person', :through => :friendships
96	- has_many :circles	96	+ has_many :circles, as: :person
97		97
98	scope :online, -> {	98	scope :online, -> {
99	joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)	99	joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddsPersonTypeToCircles < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :circles, :person_type, :string, default: "Person"
	4	+ add_index :circles, [:person_id, :person_type]
	5	+ end
	6	+
	7	+ def down
	8	+ remove_column :circles, :person_type
	9	+ remove_index :circles, [:person_id, :person_type]
	10	+ end
	11	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddProfileTypeToProfileFollowers < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :profiles_circles, :profile_type, :string, default: "Profile"
	4	+ add_index :profiles_circles, [:profile_id, :profile_type]
	5	+ end
	6	+
	7	+ def down
	8	+ remove_column :profiles_circles, :profile_type
	9	+ remove_index :profiles_circles, [:profile_id, :profile_type]
	10	+ end
	11	+end