Fixes to Plan & Account models

rohitpaulk · rohitpaulk · commit 1f292983a68c · 2015-01-11T14:47:51.000+05:30
Reorganize Plan model, Remove duplicated uniqueness validations, Fix seeds.rb Regression from coderwall#279, Remove payer_is_team_admin
diff --git a/app/models/plan.rb b/app/models/plan.rb
@@ -23,11 +23,10 @@
 class Plan < ActiveRecord::Base
   has_many :subscriptions , class_name: 'Teams::AccountPlan'
 
+  before_create :generate_public_id
   after_create :register_on_stripe
   after_destroy :unregister_from_stripe
 
-  before_create :generate_public_id
-
   CURRENCIES = %w(usd)
   MONTHLY = 'month'
 
@@ -41,6 +40,7 @@ class Plan < ActiveRecord::Base
   scope :free, -> { where(amount: 0) }
   scope :with_analytics, -> { where(analytics: true) }
   scope :without_analytics, -> { where(analytics: false) }
+
   class << self
     def enhanced_team_page_analytics
       monthly.paid.with_analytics.first
@@ -59,8 +59,26 @@ def enhanced_team_page_free
     end
   end
 
-
   alias_attribute :stripe_plan_id, :public_id
+  alias_attribute :has_analytics?, :analytics
+
+  def price
+    amount / 100
+  end
+
+  def subscription?
+    !one_time?
+  end
+
+  def free?
+    amount.zero?
+  end
+
+  # TODO refactor
+  # We should avoid nil.
+  def one_time?
+    self.interval.nil?
+  end
 
   #copy to sidekiq worker
   def stripe_plan
@@ -69,7 +87,6 @@ def stripe_plan
     nil
   end
 
-
   #sidekiq it
   def register_on_stripe
     if subscription?
@@ -95,29 +112,8 @@ def unregister_from_stripe
     end
   end
 
-  def price
-    amount / 100
-  end
-
-
-  def subscription?
-    !one_time?
-  end
-
-  def free?
-    amount.zero?
-  end
-
-  # TODO refactor
-  # We should avoid nil.
-  def one_time?
-    self.interval.nil?
-  end
-
-  alias_attribute :has_analytics?, :analytics
-
   #TODO CHANGE with default in rails 4
   def generate_public_id
-    self.public_id = SecureRandom.urlsafe_base64(4).downcase
+    self.public_id ||= SecureRandom.urlsafe_base64(4).downcase
   end
 end
diff --git a/app/models/teams/account.rb b/app/models/teams/account.rb
@@ -18,22 +18,12 @@ class Teams::Account < ActiveRecord::Base
   has_many :plans, through: :account_plans
   belongs_to :admin, class_name: 'User'
 
-  validates :team_id, presence: true, uniqueness: true
   validates_presence_of :stripe_card_token
   validates_presence_of :stripe_customer_token
+  validates :team_id, presence: true, uniqueness: true
 
   attr_protected :stripe_customer_token, :admin_id
 
-  validate :stripe_customer_token, presence: true
-  validate :stripe_card_token, presence: true
-  validate :admin_id, :payer_is_team_admin
-
-  def payer_is_team_admin
-    if admin_id.nil? #or !team.admin?(admin)
-      errors.add(:admin_id, "must be team admin to create an account")
-    end
-  end
-
   def subscribe_to!(plan, force=false)
     self.plan_ids = [plan.id]
     if force || update_on_stripe(plan)
@@ -49,7 +39,7 @@ def save_with_payment(plan=nil)
     if valid?
       create_customer unless plan.try(:one_time?)
       subscribe_to!(plan) unless plan.nil?
-      team.save!
+      save!
       return true
     else
       return false
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -13,9 +13,13 @@ def self.create_network_for(name)
   end
 end
 
+puts '---- NETWORKS ----'
+
 S.create_network_for('Ruby')
 S.create_network_for('JavaScript')
 
+puts '---- PLANS ----'
+
 Plan.find_or_create_by_id(1) do |s|
   s.amount    = 0
   s.interval  = 'month'
@@ -116,19 +120,19 @@ def self.create_network_for(name)
 S.create_protip_for(bryce) do |p|
   p.title  = 'Suspendisse potenti'
   p.body   = '<p>Suspendisse potenti. Nunc iaculis risus vel &#8216;Orci Ornare&#8217; dignissim sed vitae nulla. Nulla lobortis tempus commodo. Suspendisse <em>potenti</em>. Duis sagittis, est sit amet gravida tristique, purus lectus venenatis urna, id &#8216;molestie&#8217; magna risus ut nunc. Donec tempus tempus tellus, ac <abbr title="Hypertext Markup Language">HTML</abbr> lacinia turpis mattis ac. Fusce ac sodales magna. Fusce ac sodales <abbr title="Cascading Style Sheets">CSS</abbr> magna.</p>'
-  p.topics = %w{suspendisse potenti}
+  p.topic_list = %w{suspendisse potenti}
 end
 
 S.create_protip_for(bryce) do |p|
   p.title  = 'Vinyl Blue Bottle four loko wayfarers'
   p.body   = 'Austin try-hard artisan, bicycle rights salvia squid dreamcatcher hoodie before they sold out Carles scenester ennui. Organic mumblecore Tumblr, gentrify retro 90\'s fanny pack flexitarian raw denim roof party cornhole. Hella direct trade mixtape +1 cliche, slow-carb Neutra craft beer tousled fap DIY.'
-  p.topics = %w{etsy hipster}
+  p.topic_list = %w{etsy hipster}
 end
 
 S.create_protip_for(lisa) do |p|
   p.title  = 'Cras molestie risus a enim convallis vitae luctus libero lacinia'
   p.body   = '<p>Cras molestie risus a enim convallis vitae luctus libero lacinia. Maecenas sit <q cite="http://www.heydonworks.com">amet tellus nec mi gravida posuere</q> non pretium magna. Nulla vel magna sit amet dui <a href="#">lobortis</a> commodo vitae vel nulla. </p>'
-  p.topics = %w{cras molestie}
+  p.topic_list = %w{cras molestie}
 end
 
 puts '---- TEAMS ----'
