Skip to content

Commit 8595b24

Browse files
just3wsjust3ws
committed
Merge pull request #229 from YaroSpace/join_team_error_#391
[WIP] Join team error #391
2 parents c522e83 + cc5d7ec commit 8595b24

File tree

11 files changed

+161
-41
lines changed

11 files changed

+161
-41
lines changed

‎app/controllers/teams_controller.rb

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,31 @@ def new
7878
end
7979

8080
def create
81-
create_params = params.require(:team).permit(:selected, :slug, :name)
81+
team_params = params.require(:team).permit(:selected, :slug, :name)
82+
selected = team_params.fetch(:selected, nil)
83+
team_name = team_params.fetch(:name, '')
8284

83-
@team, confirmed = selected_or_new(create_params)
84-
@teams = Team.any_of({ :name => /#{team_to_regex(@team)}.*/i }).limit(3).to_a unless confirmed
85+
@teams = Team.with_similar_names(team_name)
8586

86-
if @team.valid? and @teams.blank? and @team.new_record?
87-
@team.add_user(current_user)
88-
# @team.edited_by(current_user)
89-
@team.save
87+
if selected == 'true'
88+
@team = Team.where(slug: team_params[:slug]).first
89+
render :create and return
90+
end
91+
92+
unless selected == 'false' || @teams.empty?
93+
@new_team_name = team_name
94+
render 'similar_teams' and return
95+
end
96+
97+
@team = Team.new(name: team_name)
98+
if @team.save
9099
record_event('created team')
100+
@team.add_user(current_user)
101+
102+
flash.now[:notice] = "Successfully created a team #{@team.name}"
103+
render :create
104+
else
105+
flash[:error] = "There was an error in creating a team #{@team.name}"
91106
end
92107
end
93108

@@ -300,23 +315,6 @@ def previous_job(job)
300315
Opportunity.with_public_id(public_id) unless public_id.nil?
301316
end
302317

303-
def team_to_regex(team)
304-
team.name.gsub(/ \-\./, '.*')
305-
end
306-
307-
def selected_or_new(opts)
308-
team = Team.new(name: opts[:name])
309-
confirm = false
310-
311-
if opts[:selected]
312-
if opts[:selected] == "true"
313-
team = Team.where(:slug => opts[:slug]).first
314-
end
315-
confirm = true
316-
end
317-
[team, confirm]
318-
end
319-
320318
def ensure_analytics_access
321319
@team = Team.find(params[:id])
322320
return redirect_to team_path(@team) unless (@team.analytics? && @team.admin?(current_user)) || is_admin?

‎app/helpers/teams_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ def change_resume_path
163163
settings_path(anchor: 'jobs')
164164
end
165165

166-
def exact_team_exists?(teams, team)
167-
teams.map { |team| Team.slugify(team.name) }.include? team.slug
166+
def exact_team_exists?(teams, name)
167+
teams.map { |team| Team.slugify(team.name) }.include? name
168168
end
169169

170170
def team_connections_links(team)
@@ -194,4 +194,4 @@ def team_twitter_link(team)
194194
end
195195

196196

197-
end
197+
end

‎app/models/team.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ def with_completed_section(section)
174174
empty = Team.new.send(section).is_a?(Array) ? [] : nil
175175
Team.where(section.to_sym.ne => empty)
176176
end
177+
178+
def with_similar_names(name)
179+
name.gsub!(/ \-\./, '.*')
180+
teams = Team.any_of({ :name => /#{name}.*/i }).limit(3).to_a
181+
end
177182
end
178183

179184
def relevancy
@@ -473,10 +478,11 @@ def sorted_team_members
473478
end
474479

475480
def add_user(user)
476-
user.update_attribute(:team_document_id, id.to_s)
477481
touch!
478-
user.save!
479-
user
482+
user.tap do |u|
483+
u.update_attribute(:team_document_id, id.to_s)
484+
u.save!
485+
end
480486
end
481487

482488
def remove_user(user)

‎app/views/layouts/product_description.html.haml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
= yield :head
2525
2626
%body#product-description
27+
= render partial: 'shared/notification_bar'
2728
= yield
2829
= render partial: 'shared/footer'
29-
30-
<!-- product_description.html.haml -->

‎app/views/shared/_notification_bar.html.haml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#main-content
2+
.notification-bar.hidden
3+
.notification-bar-inside{ class: (flash[:error].blank? ? 'notice' : 'error') }
4+
%p= flash[:notice] || flash[:error]
5+
%a.close-notification{ onclick: "$(this).parent().parent().hide();" }
6+
%span Close
7+

‎app/views/teams/_similar_teams.html.haml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
.team-avatar
88
=image_tag(team.avatar_url)
99
%h4= link_to team.name, teamname_path(:slug => team.slug), :target => :new
10-
= link_to 'Select', teams_path(Team.new, :slug=> team.slug, :selected => true), :remote => true, :method => :post, :class => "select"
10+
= link_to 'Select', teams_path(Team.new, :team => { :slug=> team.slug, selected: true }), :remote => true, :method => :post, :class => "select"
1111

12-
- unless exact_team_exists?(@teams, @team)
12+
- unless exact_team_exists?(@teams, @new_team_name)
1313
.just-create-team
1414
%h3 None of the above are my team
15-
= link_to "Create team #{@team.name}", teams_path(@team, :team => {:name => @team.name, :selected => false}), :remote => true, :method => :post, :class => "create-team"
15+
= link_to "Create team #{@new_team_name}", teams_path(Team.new, :team => { :name => @new_team_name, selected: false }), :remote => true, :method => :post, :class => "create-team"

‎app/views/teams/create.js.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<% if @teams.blank? %>
1+
var notificationBar = $('#main-content').find('.notification-bar');
2+
notificationBar.find('.notification-bar-inside').find('p').html("<%= flash[:error] || flash[:notice] %>");
3+
notificationBar.show();
4+
25
$('section.feature:not(.payment)').hide();
36
$('section.feature.payment').append('<%= escape_javascript(render :partial => "payment", :locals => {:account => @team.account || @team.build_account, :plan => @team.account.try(:current_plan)}) %>');
47
$('section.feature.payment').show();
58
setupPayment();
6-
<% else %>
7-
$('section.feature .intro .results').html('<%= escape_javascript(render :partial => 'similar_teams') %>');
8-
$('section.feature:not(.payment)').addClass('find-team');
9-
<% end %>
9+

‎app/views/teams/similar_teams.js.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
$('section.feature .intro .results').html('<%= escape_javascript(render :partial => 'similar_teams') %>');
2+
$('section.feature:not(.payment)').addClass('find-team');

‎spec/controllers/teams_controller_spec.rb

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,78 @@
3939
end
4040
end
4141

42-
end
42+
describe "#create" do
43+
let(:team) { Fabricate.build(:team, name: 'team_name') }
44+
45+
before do
46+
allow(Team).to receive(:with_similar_names).and_return([])
47+
end
48+
49+
context 'a team is selected from a list of similar teams' do
50+
it 'renders a template with a choice of tariff plans when user picks a name from existing names' do
51+
allow(Team).to receive(:where).and_return(['team_1', 'team_2'])
52+
post :create, :team => { selected: 'true', slug: 'team_name' }, format: :js
53+
54+
expect(assigns[:team]).to eq('team_1')
55+
expect(response).to render_template('create')
56+
end
57+
58+
it 'renders a template with a choice of tariff plans if user picks his own team name' do
59+
post :create, :team => { name: 'team_name', selected: 'false' }, format: :js
60+
expect(response).to render_template('create')
61+
end
62+
end
63+
64+
context 'a team does not exist' do
65+
let(:response) { post :create, :team => { name: 'team_name' }, format: :js }
66+
67+
before do
68+
allow(Team).to receive(:new).and_return(team)
69+
allow(team).to receive(:save).and_return(true)
70+
allow(team).to receive(:add_user).and_return(true)
71+
end
72+
73+
it 'creates a new team' do
74+
expect(team).to receive(:save)
75+
response
76+
end
77+
78+
it 'adds current user to the team' do
79+
expect(team).to receive(:add_user).with(current_user)
80+
response
81+
end
82+
83+
it 'records an event "created team"' do
84+
expect(controller).to receive(:record_event).with('created team')
85+
response
86+
end
87+
88+
it 'renders template with option to join' do
89+
expect(response).to be_success
90+
expect(response).to render_template('create')
91+
expect(flash[:notice]).to eq("Successfully created a team team_name")
92+
end
93+
94+
it 'renders failure notice' do
95+
allow(team).to receive(:save).and_return(false)
96+
response
97+
expect(flash[:error]).to eq("There was an error in creating a team team_name")
98+
end
99+
end
100+
101+
context 'a team with similar name already exists' do
102+
before do
103+
allow(Team).to receive(:new).and_return(team)
104+
allow(Team).to receive(:with_similar_names).and_return([ team ])
105+
end
106+
107+
it 'renders a template with a list of similar teams' do
108+
post :create, :team => { name: 'team_name' }, format: :js
109+
110+
expect(assigns[:new_team_name]).to eq('team_name')
111+
expect(response).to render_template('similar_teams')
112+
end
113+
end
114+
end
115+
116+
end

‎spec/helpers/teams_helper_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
require 'spec_helper'
2+
3+
RSpec.describe TeamsHelper, :type => :helper do
4+
describe "#exact_team_exists?" do
5+
let(:teams) { Fabricate.build_times(3, :team) }
6+
7+
it "returns true if there is a team with exact matching name" do
8+
teams << Fabricate.build(:team, name: 'test_name', slug: 'test-name')
9+
expect(helper.exact_team_exists?(teams, 'test-name')).to be_truthy
10+
end
11+
12+
it "returns false if there is no team with exact mathcing name" do
13+
expect(helper.exact_team_exists?(teams, 'non-existent team name')).to be_falsey
14+
end
15+
16+
17+
end
18+
end

0 commit comments

Comments
 (0)