Fixes reverted commit, adds new sti table and makes it a follower

Dylan Guedes
1 parent aa37360c
Showing 5 changed files with 19 additions and 17 deletions Show diff stats
app/models/external_person.rb
app/models/external_profile.rb
db/migrate/20160822110424_rename_external_people_to_external_profiles.rb
db/migrate/20160829170524_rename_external_people_to_external_profiles.rb
db/migrate/20160829185118_add_type_to_external_profile.rb
@@ -3,15 +3,11 @@ class ExternalPerson &lt; ExternalProfile
  
   include Human
   include ProfileEntity
-<<<<<<< HEAD
   include Follower
-  include Followable
  
   has_many :profile_followers, :as => :profile
   has_many :circles, :through => :profile_followers
   has_many :owned_circles, as: :owner, :class_name => "Circle"
-=======
->>>>>>> parent of bfbd548... Revert "Adds new ExternalProfile module and refactor ExternalPerson"
  
   validates_uniqueness_of :identifier, scope: :source
  
@@ -138,7 +134,6 @@ class ExternalPerson &lt; ExternalProfile
     }
   end
  
-<<<<<<< HEAD
   # External Person should respond to all methods in Person and Profile
   def person_instance_methods
     methods_and_responses = {
@@ -272,6 +267,4 @@ class ExternalPerson &lt; ExternalProfile
     end
     derivated_methods
   end
-=======
->>>>>>> parent of bfbd548... Revert "Adds new ExternalProfile module and refactor ExternalPerson"
 end
 class ExternalProfile < ActiveRecord::Base
  
-  include Follower
+  include Followable
  
   has_many :circles, as: :person
  
@@ -1,9 +0,0 @@
-class RenameExternalPeopleToExternalProfiles < ActiveRecord::Migration
-  def up
-    rename_table :external_people, :external_profiles
-  end
-
-  def down
-    rename_table :external_profiles, :external_people
-  end
-end
@@ -0,0 +1,9 @@
+class RenameExternalPeopleToExternalProfiles < ActiveRecord::Migration
+  def up
+    rename_table :external_people, :external_profiles
+  end
+
+  def down
+    rename_table :external_profiles, :external_people
+  end
+end
@@ -0,0 +1,9 @@
+class AddTypeToExternalProfile < ActiveRecord::Migration
+  def up
+    add_column :external_profiles, :type, :string, default: "ExternalProfile"
+  end
+
+  def down
+    remove_column :external_profiles, :type
+  end
+end
...	...	@@ -3,15 +3,11 @@ class ExternalPerson < ExternalProfile
3	3
4	4	include Human
5	5	include ProfileEntity
6		-<<<<<<< HEAD
7	6	include Follower
8		- include Followable
9	7
10	8	has_many :profile_followers, :as => :profile
11	9	has_many :circles, :through => :profile_followers
12	10	has_many :owned_circles, as: :owner, :class_name => "Circle"
13		-=======
14		->>>>>>> parent of bfbd548... Revert "Adds new ExternalProfile module and refactor ExternalPerson"
15	11
16	12	validates_uniqueness_of :identifier, scope: :source
17	13
...	...	@@ -138,7 +134,6 @@ class ExternalPerson < ExternalProfile
138	134	}
139	135	end
140	136
141		-<<<<<<< HEAD
142	137	# External Person should respond to all methods in Person and Profile
143	138	def person_instance_methods
144	139	methods_and_responses = {
...	...	@@ -272,6 +267,4 @@ class ExternalPerson < ExternalProfile
272	267	end
273	268	derivated_methods
274	269	end
275		-=======
276		->>>>>>> parent of bfbd548... Revert "Adds new ExternalProfile module and refactor ExternalPerson"
277	270	end
...	...
1	1	class ExternalProfile < ActiveRecord::Base
2	2
3		- include Follower
	3	+ include Followable
4	4
5	5	has_many :circles, as: :person
6	6
...	...
...	...	@@ -1,9 +0,0 @@
1		-class RenameExternalPeopleToExternalProfiles < ActiveRecord::Migration
2		- def up
3		- rename_table :external_people, :external_profiles
4		- end
5		-
6		- def down
7		- rename_table :external_profiles, :external_people
8		- end
9		-end
...	...	@@ -0,0 +1,9 @@
	1	+class RenameExternalPeopleToExternalProfiles < ActiveRecord::Migration
	2	+ def up
	3	+ rename_table :external_people, :external_profiles
	4	+ end
	5	+
	6	+ def down
	7	+ rename_table :external_profiles, :external_people
	8	+ end
	9	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+class AddTypeToExternalProfile < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :external_profiles, :type, :string, default: "ExternalProfile"
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :external_profiles, :type
	8	+ end
	9	+end
...	...