Fixed broken link and use the new Team model name.

just3ws · just3ws · commit 5b0892d0e5b4 · 2014-11-11T02:11:00.000-06:00
diff --git a/app/models/followed_team.rb b/app/models/followed_team.rb
@@ -1,5 +1,5 @@
 class FollowedTeam < ActiveRecord::Base
-  belongs_to :team, class_name: 'PgTeam'
+  belongs_to :team, class_name: 'Team'
   belongs_to :user
 end
 
diff --git a/app/models/pg_team.rb b/app/models/pg_team.rb
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -3,8 +3,21 @@
 
 #Rename to Team when Mongodb is dropped
 class Team < ActiveRecord::Base
+  DEFAULT_HEX_BRAND        = '#343131'
+  LEADERBOARD_KEY          = 'teams:leaderboard'
+  FEATURED_TEAMS_CACHE_KEY = 'featured_teams_results'
+  MAX_TEAM_SCORE           = 400
+
+  self.table_name = 'teams'
+
   include SearchModule
   include TeamSearch
+  include LeaderboardRedisRank
+  include TeamAnalytics
+  include TeamMigration
+
+  mount_uploader :avatar, TeamUploader
+
   mapping team: {
     properties: {
       id:                 { type: 'string', index: 'not_analyzed' },
@@ -27,35 +40,33 @@ class Team < ActiveRecord::Base
     }
   }
 
-  include LeaderboardRedisRank
-  include TeamAnalytics
-  include TeamMigration
+  scope :featured, ->{ where(premium: true, valid_jobs: true, hide_from_featured: false) }
 
-  DEFAULT_HEX_BRAND        = '#343131'
-  LEADERBOARD_KEY          = 'teams:leaderboard'
-  FEATURED_TEAMS_CACHE_KEY = 'featured_teams_results'
-  MAX_TEAM_SCORE           = 400
 
-  self.table_name = 'teams'
+  before_validation :create_slug!
+
+  validates :slug, uniqueness: true, presence: true
+
 
-  #TODO add inverse_of
-  has_one :account, class_name: 'Teams::Account', foreign_key: 'team_id', dependent: :delete
+  has_many :followers, through: :follows, source: :team
 
-  has_many :members, class_name: 'Teams::Member', foreign_key: 'team_id', dependent: :delete_all
-  has_many :links, class_name: 'Teams::Link', foreign_key: 'team_id', dependent: :delete_all
+  has_many :follows,   class_name: 'FollowedTeam',    foreign_key: 'team_id', dependent: :destroy
+  has_many :jobs,      class_name: 'Opportunity',     foreign_key: 'team_id', dependent: :destroy
+  has_many :links,     class_name: 'Teams::Link',     foreign_key: 'team_id', dependent: :delete_all
   has_many :locations, class_name: 'Teams::Location', foreign_key: 'team_id', dependent: :delete_all
+  has_many :members,   class_name: 'Teams::Member',   foreign_key: 'team_id', dependent: :delete_all
+  has_one :account,    class_name: 'Teams::Account',  foreign_key: 'team_id', dependent: :delete
 
   def featured_links
     links
   end
 
   has_many :jobs, class_name: 'Opportunity', foreign_key: 'team_id', dependent: :destroy
 
-  #def jobs
-  #all_jobs.valid
-  #end
+  private def create_slug!
+    self.slug = name.parameterize
+  end
 
-  #Replaced with jobs
   def all_jobs
     jobs.order('created_at DESC')
   end
@@ -186,10 +197,6 @@ def university?
     true
   end
 
-  def locations
-    (location || '').split(';').collect { |location| location.strip }
-  end
-
   def locations_message
     if premium?
       locations.collect(&:name).join(', ')
diff --git a/app/models/teams/location.rb b/app/models/teams/location.rb
@@ -2,9 +2,7 @@ class Teams::Location < ActiveRecord::Base
   include Geocoder::Model::ActiveRecord
 
   # Rails 3 is stupid
-  belongs_to :team, class_name: 'Team',
-    foreign_key: 'team_id',
-    touch: true
+  belongs_to :team, class_name: 'Team', foreign_key: 'team_id', touch: true
 
   geocoded_by :address do |obj, results|
     if geo = results.first and obj.address.downcase.include?(geo.city.try(:downcase) || "")
diff --git a/app/uploaders/team_uploader.rb b/app/uploaders/team_uploader.rb
@@ -3,7 +3,7 @@ class TeamUploader < CoderwallUploader
   process resize_and_pad: [100, 100]
 
   def store_dir
-    "/uploads/team/avatar/#{model.mongo_id || model.id}"
+    "uploads/team/avatar/#{model.mongo_id || model.id}"
   end
 
   def default_url
