fixes some tests and add migration TODO finisht it

Marcos Pereira
1 parent 3c449838
Showing 6 changed files with 23 additions and 17 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/models/person.rb
db/migrate/20160616143830_create_followers_for_social_circles.rb
db/schema.rb
test/functional/profile_controller_test.rb
test/unit/person_test.rb
@@ -128,9 +128,9 @@ class ContentViewerController &lt; ApplicationController
     end
     unless @page.display_to?(user)
-      if !profile.visible? || profile.secret? || (user && user.follows?(profile)) || user.blank?
+      if !profile.visible? || profile.secret? || (user && profile.in_social_circle?(user)) || user.blank?
         render_access_denied
-      else #!profile.public?
+      else
         private_profile_partial_parameters
         render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
       end
@@ -603,10 +603,4 @@ class Person &lt; Profile
     self.is_a_friend?(person) || super
   end
-  #protected
-
-  #def followed_by?(profile)
-  #  self == profile || self.followers.include?(profile)
-  #end
-
 end
@@ -0,0 +1,11 @@
+class CreateFollowersForSocialCircles < ActiveRecord::Migration
+  def up
+    #OK amizades
+    #membros de comunidade
+    #OK fans de empreendimento
+
+    execute("INSERT INTO profile_followers(follower_id, profile_id, group) SELECT friend_id, person_id, group FROM friendships")
+    execute("INSERT INTO profile_followers(follower_id, profile_id, group) SELECT f.person_id, f.enterprise_id, 'favorites' FROM  favorite_enterprise_people AS f")
+
+  end
+end
@@ -375,9 +375,6 @@ ActiveRecord::Schema.define(version: 20160422163123) do
     t.integer "external_environment_id"
   end
-  add_index "environment_external_environments", ["environment_id"], name: "index_environment_external_environments_on_environment_id", using: :btree
-  add_index "environment_external_environments", ["external_environment_id"], name: "index_environment_external_environments_on_external_environment_id", using: :btree
-
   create_table "environments", force: :cascade do |t|
     t.string   "name"
     t.string   "contact_email"
@@ -771,12 +771,13 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal 15, assigns(:activities).size
   end
-  should 'not see the friends activities in the current profile' do
+  should 'not see the followers activities in the current profile' do
     p2 = create_user.person
-    refute profile.is_a_friend?(p2)
+    refute profile.follows?(p2)
     p3 = create_user.person
-    p3.add_friend(profile)
-    assert p3.is_a_friend?(profile)
+    profile.follow(p3)
+    assert profile.follows?(p3)
+
     ActionTracker::Record.destroy_all
     scrap1 = create(Scrap, defaults_for_scrap(:sender => p2, :receiver => p3))
@@ -964,7 +965,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'have activities defined if logged in and is following profile' do
     login_as(profile.identifier)
     p1= fast_create(Person)
-    p1.add_friend(profile)
+
+    profile.follow(p1)
+
     ActionTracker::Record.destroy_all
     get :index, :profile => p1.identifier
     assert_equal [], assigns(:activities)
@@ -1035,12 +1035,13 @@ class PersonTest &lt; ActiveSupport::TestCase
     p2 = create_user('p2').person
     p3 = create_user('p3').person
     c = fast_create(Community, :name => "Foo")
+
     c.add_member(p1)
     process_delayed_job_queue
     c.add_member(p3)
     process_delayed_job_queue
-    assert_equal 4, ActionTracker::Record.count
+    assert_equal 5, ActionTracker::Record.count
     assert_equal 5, ActionTrackerNotification.count
     has_add_member_notification = false
     ActionTrackerNotification.all.map do |notification|
	@@ -128,9 +128,9 @@ class ContentViewerController < ApplicationController		@@ -128,9 +128,9 @@ class ContentViewerController < ApplicationController
128	end	128	end
129		129
130	unless @page.display_to?(user)	130	unless @page.display_to?(user)
131	- if !profile.visible? \|\| profile.secret? \|\| (user && user.follows?(profile)) \|\| user.blank?	131	+ if !profile.visible? \|\| profile.secret? \|\| (user && profile.in_social_circle?(user)) \|\| user.blank?
132	render_access_denied	132	render_access_denied
133	- else #!profile.public?	133	+ else
134	private_profile_partial_parameters	134	private_profile_partial_parameters
135	render :template => 'profile/_private_profile', :status => 403, :formats => [:html]	135	render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
136	end	136	end
	@@ -603,10 +603,4 @@ class Person < Profile		@@ -603,10 +603,4 @@ class Person < Profile
603	self.is_a_friend?(person) \|\| super	603	self.is_a_friend?(person) \|\| super
604	end	604	end
605		605
606	- #protected
607	-
608	- #def followed_by?(profile)
609	- # self == profile \|\| self.followers.include?(profile)
610	- #end
611	-
612	end	606	end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class CreateFollowersForSocialCircles < ActiveRecord::Migration
	2	+ def up
	3	+ #OK amizades
	4	+ #membros de comunidade
	5	+ #OK fans de empreendimento
	6	+
	7	+ execute("INSERT INTO profile_followers(follower_id, profile_id, group) SELECT friend_id, person_id, group FROM friendships")
	8	+ execute("INSERT INTO profile_followers(follower_id, profile_id, group) SELECT f.person_id, f.enterprise_id, 'favorites' FROM favorite_enterprise_people AS f")
	9	+
	10	+ end
	11	+end