WIP: Fixed error in the user/membership team relationship

just3ws · just3ws · commit eec4976f99c6 · 2014-11-26T15:20:15.000-06:00
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -16,7 +16,6 @@ class Team < ActiveRecord::Base
   include TeamSearch
   include SearchModule
 
-
   mount_uploader :avatar, TeamUploader
 
   scope :featured, ->{ where(premium: true, valid_jobs: true, hide_from_featured: false) }
@@ -104,7 +103,7 @@ def self.search(query_string, country, page, per_page, search_type = :query_and_
         filter :term, country: country unless country.nil?
         sort { by [{ score: 'desc', total_member_count: 'desc', '_score' => {} }] }
       end
-    rescue Tire::Search::SearchRequestFailed => e
+    rescue Tire::Search::SearchRequestFailed
       SearchResultsWrapper.new(nil, "Looks like our teams server is down. Try again soon.")
     end
   end
@@ -378,16 +377,19 @@ def has_specialties?
   def specialties_with_counts
     @specialties_with_counts ||= begin
                                    specialties = {}
+
                                    members.each do |user|
                                      user.speciality_tags.each do |tag|
                                        tag              = tag.downcase
                                        specialties[tag] = 0 if specialties[tag].blank?
                                        specialties[tag] += 1
                                      end
                                    end
-                                   unless only_one_occurence_of_each = specialties.values.sum == specialties.values.length
+
+                                   unless specialties.values.sum == specialties.values.length
                                      specialties.reject! { |k, v| v <= 1 }
                                    end
+
                                    specialties.sort_by { |k, v| v }.reverse[0..7]
                                  end
   end
@@ -430,6 +432,7 @@ def sorted_members
 
   def add_user(user)
     touch!
+
     user.tap do |u|
       u.update_attribute(:team_document_id, id.to_s)
       u.save!
@@ -439,7 +442,9 @@ def add_user(user)
   def add_member(user)
     Rails.logger.warn("Called #{self.class.name}#add_member(#{user.inspect}")
 
-    return member if member = members.select { |m| m.user_id == user.id }
+    member = members.select { |m| m.user_id == user.id }.first
+    return member if member
+
     member = members.create(user_id: user.id)
     save!
     member
@@ -450,7 +455,9 @@ def remove_member(user)
     members.destroy(member)
     save!
   end
+
   attr_accessor :skip_validations
+
   def touch!
     self.updated_at = Time.now.utc
     save!(validate: !skip_validations)
@@ -573,7 +580,7 @@ def predominant
   def admin?(user)
     return false if user.nil?
     return true if user.admin?
-    if everyone_is_an_admin = admins.empty?
+    if admins.empty?
       members.include?(user)
     else
       admins.include?(user.id)
@@ -781,9 +788,12 @@ def latest_editors
   end
 
   def video_url
-    if self.youtube_url =~ /vimeo\.com\/(\d+)/
+    youtube_pattern = /(youtube\.com|youtu\.be)\/(watch\?v=)?([\w\-_]{11})/i
+    vimeo_pattern = /vimeo\.com\/(\d+)/
+
+    if self.youtube_url =~ vimeo_pattern
       "https://player.vimeo.com/video/#{$1}"
-    elsif self.youtube_url =~ /(youtube\.com|youtu\.be)\/(watch\?v=)?([\w\-_]{11})/i
+    elsif self.youtube_url =~ youtube_pattern
       "https://www.youtube.com/embed/#{$3}"
     else
       self.youtube_url
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -41,6 +41,7 @@ class User < ActiveRecord::Base
     users
   }
 
+
   #TODO maybe we don't need this
   BLANK_PROFILE_URL = 'blank-mugshot.png'
 
@@ -84,6 +85,15 @@ class User < ActiveRecord::Base
   has_many :github_repositories, through: :github_profile , source: :repositories
 
   belongs_to :team, class_name: 'Team'
+  has_one :membership, class_name: 'Teams::Member'
+
+  def on_premium_team?
+    if membership
+      membership.team.premium?
+    else
+      false
+    end
+  end
 
   geocoded_by :location, latitude: :lat, longitude: :lng, country: :country, state_code: :state_name
   # FIXME: Move to background job
@@ -219,11 +229,6 @@ def team_ids
     [team_id]
   end
 
-
-  def on_premium_team?
-    team.try(:premium?) || false
-  end
-
   def following_team?(team)
     followed_teams.collect(&:team_id).include?(team.id.to_s)
   end
@@ -903,7 +908,7 @@ def destroy_badges
   end
 
   before_create do
-      self.referral_token ||= SecureRandom.hex(8)
+    self.referral_token ||= SecureRandom.hex(8)
   end
 
   after_save :refresh_dependencies
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -1,8 +1,7 @@
-require 'spec_helper'
-
-RSpec.describe User, type: :model, skip: true do
+RSpec.describe User, type: :model do
   it { is_expected.to have_one :github_profile }
   it { is_expected.to have_many :github_repositories }
+
   before :each do
     User.destroy_all
   end
@@ -29,7 +28,7 @@
   end
 
   it 'should not allow the username in multiple cases to be use on creation' do
-    user = Fabricate(:user, username: 'MDEITERS')
+    Fabricate(:user, username: 'MDEITERS')
     lambda do
       expect(Fabricate(:user, username: 'mdeiters')).to raise_error('Validation failed: Username has already been taken')
     end
@@ -68,7 +67,7 @@
     user_with_3_badges = Fabricate :user
     badge1 = user_with_3_badges.badges.create!(badge_class_name: Mongoose3.name)
     badge2 = user_with_3_badges.badges.create!(badge_class_name: Octopussy.name)
-    badge3 = user_with_3_badges.badges.create!(badge_class_name: Mongoose.name)
+    user_with_3_badges.badges.create!(badge_class_name: Mongoose.name)
 
     expect(User.top(1)).to include(user_with_3_badges)
     expect(User.top(1)).not_to include(user_with_2_badges)
@@ -84,7 +83,7 @@
   it 'returns badges in order created with latest first' do
     user = Fabricate :user
     badge1 = user.badges.create!(badge_class_name: Mongoose3.name)
-    badge2 = user.badges.create!(badge_class_name: Octopussy.name)
+    user.badges.create!(badge_class_name: Octopussy.name)
     badge3 = user.badges.create!(badge_class_name: Mongoose.name)
 
     expect(user.badges.first).to eq(badge3)
@@ -217,7 +216,8 @@ class AlsoNotaBadge < BadgeBase
 
   it 'should indicate when user is on a premium team' do
     team = Fabricate(:team, premium: true)
-    team.add_member(user = Fabricate(:user))
+    member = team.add_member(user = Fabricate(:user))
+
     expect(user.on_premium_team?).to eq(true)
   end
 
